diff --git a/lib/confd/client.py b/lib/confd/client.py index 0a27b838507f923a2e4b40eb892e85632cf3bfd1..9b3f16088540b0748ec4496c432cb52a4c47f4fc 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 d96729d7eb710fa518eec0211dc5b5f2e616180f..3acf423ab2349b3bb71e5ca4badd4a6e65b4a0f4 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), \