Revision a5ce2ea2 lib/server/confd.py

b/lib/server/confd.py
49 49
from ganeti import errors
50 50
from ganeti import daemon
51 51
from ganeti import netutils
52
from ganeti import pathutils
52 53

  
53 54

  
54 55
class ConfdAsyncUDPServer(daemon.AsyncUDPSocket):
......
114 115
    self.last_notification = 0
115 116

  
116 117
    # Asyncronous inotify handler for config changes
117
    cfg_file = constants.CLUSTER_CONF_FILE
118
    cfg_file = pathutils.CLUSTER_CONF_FILE
118 119
    self.wm = pyinotify.WatchManager()
119 120
    self.inotify_handler = asyncnotifier.SingleFileEventHandler(self.wm,
120 121
                                                                self.OnInotify,
......
249 250

  
250 251
  # TODO: collapse HMAC daemons handling in daemons GenericMain, when we'll
251 252
  # have more than one.
252
  if not os.path.isfile(constants.CONFD_HMAC_KEY):
253
    print >> sys.stderr, "Need HMAC key %s to run" % constants.CONFD_HMAC_KEY
253
  if not os.path.isfile(pathutils.CONFD_HMAC_KEY):
254
    print >> sys.stderr, "Need HMAC key %s to run" % pathutils.CONFD_HMAC_KEY
254 255
    sys.exit(constants.EXIT_FAILURE)
255 256

  
256 257
  # TODO: once we have a cluster param specifying the address family

Also available in: Unified diff