Revision 57407093
b/lib/config.py | ||
---|---|---|
50 | 50 |
from ganeti import uidpool |
51 | 51 |
from ganeti import netutils |
52 | 52 |
from ganeti import runtime |
53 |
from ganeti import pathutils |
|
53 | 54 |
|
54 | 55 |
|
55 | 56 |
_config_lock = locking.SharedLock("ConfigWriter") |
... | ... | |
167 | 168 |
self._config_data = None |
168 | 169 |
self._offline = offline |
169 | 170 |
if cfg_file is None: |
170 |
self._cfg_file = constants.CLUSTER_CONF_FILE
|
|
171 |
self._cfg_file = pathutils.CLUSTER_CONF_FILE
|
|
171 | 172 |
else: |
172 | 173 |
self._cfg_file = cfg_file |
173 | 174 |
self._getents = _getents |
... | ... | |
206 | 207 |
"""Check if the cluster is configured. |
207 | 208 |
|
208 | 209 |
""" |
209 |
return os.path.exists(constants.CLUSTER_CONF_FILE)
|
|
210 |
return os.path.exists(pathutils.CLUSTER_CONF_FILE)
|
|
210 | 211 |
|
211 | 212 |
def _GenerateOneMAC(self): |
212 | 213 |
"""Generate one mac address |
Also available in: Unified diff