From 5a76d5f65ca3511a5043256deebe0e348a2d6b7d 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/confd/*.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/confd/client.py | 3 ++-
lib/confd/server.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/confd/client.py b/lib/confd/client.py
index 0a27b8385..9b3f16088 100644
--- a/lib/confd/client.py
+++ b/lib/confd/client.py
@@ -63,6 +63,7 @@ from ganeti import confd
from ganeti import ssconf
from ganeti import compat
from ganeti import netutils
+from ganeti import pathutils
class ConfdAsyncUDPClient(daemon.AsyncUDPSocket):
@@ -689,5 +690,5 @@ def GetConfdClient(callback):
ss = ssconf.SimpleStore()
mc_file = ss.KeyToFilename(constants.SS_MASTER_CANDIDATES_IPS)
mc_list = utils.ReadFile(mc_file).splitlines()
- hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY)
+ hmac_key = utils.ReadFile(pathutils.CONFD_HMAC_KEY)
return ConfdClient(hmac_key, mc_list, callback)
diff --git a/lib/confd/server.py b/lib/confd/server.py
index d96729d7e..3acf423ab 100644
--- a/lib/confd/server.py
+++ b/lib/confd/server.py
@@ -35,6 +35,7 @@ from ganeti import errors
from ganeti import utils
from ganeti import serializer
from ganeti import ssconf
+from ganeti import pathutils
from ganeti.confd import querylib
@@ -63,7 +64,7 @@ class ConfdProcessor(object):
"""
self.disabled = True
- self.hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY)
+ self.hmac_key = utils.ReadFile(pathutils.CONFD_HMAC_KEY)
self.reader = None
assert \
not constants.CONFD_REQS.symmetric_difference(self.DISPATCH_TABLE), \
--
GitLab