X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/fe4f6dcad3e3b302621358882694a3ddcb62878c..a59d5fa1351df43917514a1e30cd52f6a3789340:/lib/vcluster.py diff --git a/lib/vcluster.py b/lib/vcluster.py index 0443d11..407c352 100644 --- a/lib/vcluster.py +++ b/lib/vcluster.py @@ -39,7 +39,7 @@ _ROOTDIR_ENVNAME = "GANETI_ROOTDIR" _HOSTNAME_ENVNAME = "GANETI_HOSTNAME" #: List of paths which shouldn't be virtualized -_VPATH_WHITELIST = frozenset([ +_VPATH_WHITELIST = compat.UniqueFrozenset([ ETC_HOSTS, ]) @@ -142,7 +142,7 @@ def GetVirtualHostname(): return _VIRT_HOSTNAME -def _MakeNodeRoot(base, node_name): +def MakeNodeRoot(base, node_name): """Appends a node name to the base directory. """ @@ -162,7 +162,7 @@ def ExchangeNodeRoot(node_name, filename, """ if _basedir: pure = _RemoveNodePrefix(filename, _noderoot=_noderoot) - result = "%s/%s" % (_MakeNodeRoot(_basedir, node_name), pure) + result = "%s/%s" % (MakeNodeRoot(_basedir, node_name), pure) else: result = filename @@ -175,7 +175,7 @@ def EnvironmentForHost(hostname, _basedir=_VIRT_BASEDIR): """ if _basedir: return { - _ROOTDIR_ENVNAME: _MakeNodeRoot(_basedir, hostname), + _ROOTDIR_ENVNAME: MakeNodeRoot(_basedir, hostname), _HOSTNAME_ENVNAME: hostname, } else: