Skip to content
Snippets Groups Projects
Commit 9f2265bc authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

constants: Stop using wildcard import for pathutils


It still needs to be imported for hypervisor parameter defaults, but
after this change paths are no longer exported from constants.

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 9eeb0aa5
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ import socket ...@@ -26,7 +26,7 @@ import socket
from ganeti import _autoconf from ganeti import _autoconf
from ganeti import _vcsversion from ganeti import _vcsversion
from ganeti.pathutils import * # pylint: disable=W0401,W0614 from ganeti import pathutils
# various versions # various versions
...@@ -1702,7 +1702,7 @@ HVC_DEFAULTS = { ...@@ -1702,7 +1702,7 @@ HVC_DEFAULTS = {
HV_NIC_TYPE: HT_NIC_RTL8139, HV_NIC_TYPE: HT_NIC_RTL8139,
HV_DISK_TYPE: HT_DISK_PARAVIRTUAL, HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
HV_VNC_BIND_ADDRESS: IP4_ADDRESS_ANY, HV_VNC_BIND_ADDRESS: IP4_ADDRESS_ANY,
HV_VNC_PASSWORD_FILE: VNC_PASSWORD_FILE, HV_VNC_PASSWORD_FILE: pathutils.VNC_PASSWORD_FILE,
HV_ACPI: True, HV_ACPI: True,
HV_PAE: True, HV_PAE: True,
HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader", HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader",
...@@ -2028,7 +2028,4 @@ FAKE_OP_MASTER_TURNUP = "OP_CLUSTER_IP_TURNUP" ...@@ -2028,7 +2028,4 @@ FAKE_OP_MASTER_TURNUP = "OP_CLUSTER_IP_TURNUP"
FAKE_OP_MASTER_TURNDOWN = "OP_CLUSTER_IP_TURNDOWN" FAKE_OP_MASTER_TURNDOWN = "OP_CLUSTER_IP_TURNDOWN"
# Do not re-export imported modules # Do not re-export imported modules
del re, _vcsversion, _autoconf, socket del re, _vcsversion, _autoconf, socket, pathutils
# Unintended imports from pathutils (temporary)
del GetLogFilename
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment