Revision 40960882

b/lib/vcluster.py
30 30
import os
31 31

  
32 32
from ganeti import compat
33
from ganeti import _constants
34
# cannot use constants, as this would cause a circular import
33 35

  
34 36

  
35
ETC_HOSTS = "/etc/hosts"
37
ETC_HOSTS = _constants.V_CLUSTER_ETC_HOSTS
36 38

  
37
_VIRT_PATH_PREFIX = "/###-VIRTUAL-PATH-###,"
38
_ROOTDIR_ENVNAME = "GANETI_ROOTDIR"
39
_HOSTNAME_ENVNAME = "GANETI_HOSTNAME"
39
_VIRT_PATH_PREFIX = _constants.V_CLUSTER_VIRT_PATH_PREFIX
40
_ROOTDIR_ENVNAME = _constants.V_CLUSTER_ROOTDIR_ENVNAME
41
_HOSTNAME_ENVNAME = _constants.V_CLUSTER_HOSTNAME_ENVNAME
40 42

  
41 43
#: List of paths which shouldn't be virtualized
42
_VPATH_WHITELIST = compat.UniqueFrozenset([
43
  ETC_HOSTS,
44
  ])
44
_VPATH_WHITELIST = _constants.V_CLUSTER_VPATH_WHITELIST
45 45

  
46 46

  
47 47
def _GetRootDirectory(envname):
b/src/Ganeti/Constants.hs
4281 4281
ndsStartNodeDaemon :: String
4282 4282
ndsStartNodeDaemon = "start_node_daemon"
4283 4283

  
4284
-- * VCluster related constants
4285

  
4286
vClusterEtcHosts :: String
4287
vClusterEtcHosts = "/etc/hosts"
4288

  
4289
vClusterVirtPathPrefix :: String
4290
vClusterVirtPathPrefix = "/###-VIRTUAL-PATH-###,"
4291

  
4292
vClusterRootdirEnvname :: String
4293
vClusterRootdirEnvname = "GANETI_ROOTDIR"
4294

  
4295
vClusterHostnameEnvname :: String
4296
vClusterHostnameEnvname = "GANETI_HOSTNAME"
4297

  
4298
vClusterVpathWhitelist :: FrozenSet String
4299
vClusterVpathWhitelist = ConstantUtils.mkSet [ vClusterEtcHosts ]
4300

  
4284 4301
-- * The source reasons for the execution of an OpCode
4285 4302

  
4286 4303
opcodeReasonSrcClient :: String

Also available in: Unified diff