From 57407093d7c8393c630c6fa4e1c5bf180ffb1018 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 17 Sep 2012 18:28:54 +0200
Subject: [PATCH] Migrate lib/config.py from constants to pathutils
File system paths moved from constants to pathutils.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/config.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 236587b72..952d1e8cc 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -50,6 +50,7 @@ from ganeti import serializer
from ganeti import uidpool
from ganeti import netutils
from ganeti import runtime
+from ganeti import pathutils
_config_lock = locking.SharedLock("ConfigWriter")
@@ -167,7 +168,7 @@ class ConfigWriter:
self._config_data = None
self._offline = offline
if cfg_file is None:
- self._cfg_file = constants.CLUSTER_CONF_FILE
+ self._cfg_file = pathutils.CLUSTER_CONF_FILE
else:
self._cfg_file = cfg_file
self._getents = _getents
@@ -206,7 +207,7 @@ class ConfigWriter:
"""Check if the cluster is configured.
"""
- return os.path.exists(constants.CLUSTER_CONF_FILE)
+ return os.path.exists(pathutils.CLUSTER_CONF_FILE)
def _GenerateOneMAC(self):
"""Generate one mac address
--
GitLab