diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py index a95cf7f159fbfd749231f472551ae51ed336d3da..5c55b7c01ed42d813f38545410093842df680c32 100644 --- a/lib/utils/__init__.py +++ b/lib/utils/__init__.py @@ -41,6 +41,7 @@ import signal from ganeti import errors from ganeti import constants from ganeti import compat +from ganeti import pathutils from ganeti.utils.algo import * from ganeti.utils.filelock import * @@ -466,7 +467,7 @@ def EnsureDaemon(name): """Check for and start daemon if not alive. """ - result = RunCmd([constants.DAEMON_UTIL, "check-and-start", name]) + result = RunCmd([pathutils.DAEMON_UTIL, "check-and-start", name]) if result.failed: logging.error("Can't start daemon '%s', failure %s, output: %s", name, result.fail_reason, result.output) @@ -479,7 +480,7 @@ def StopDaemon(name): """Stop daemon """ - result = RunCmd([constants.DAEMON_UTIL, "stop", name]) + result = RunCmd([pathutils.DAEMON_UTIL, "stop", name]) if result.failed: logging.error("Can't stop daemon '%s', failure %s, output: %s", name, result.fail_reason, result.output) diff --git a/lib/utils/io.py b/lib/utils/io.py index 0e2f007c1d2f115717495a132212d1bea9c0b14f..cf3e453246cf7d8251c276b5f0658b36b029df33 100644 --- a/lib/utils/io.py +++ b/lib/utils/io.py @@ -32,6 +32,7 @@ import stat from ganeti import errors from ganeti import constants +from ganeti import pathutils from ganeti.utils import filelock @@ -903,7 +904,7 @@ def DaemonPidFileName(name): daemon name """ - return PathJoin(constants.RUN_DIR, "%s.pid" % name) + return PathJoin(pathutils.RUN_DIR, "%s.pid" % name) def WritePidFile(pidfile):