Fix network opcode parameters

[ganeti-local] / lib / pathutils.py

diff --git a/lib/pathutils.py b/lib/pathutils.py
index 457b227..c50c6da 100644 (file)
--- a/lib/pathutils.py
+++ b/lib/pathutils.py
@@ -43,8 +43,9 @@ DAEMON_UTIL = _autoconf.PKGLIBDIR + "/daemon-util"
 IMPORT_EXPORT_DAEMON = _autoconf.PKGLIBDIR + "/import-export"
 KVM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/kvm-console-wrapper"
 KVM_IFUP = _autoconf.PKGLIBDIR + "/kvm-ifup"
-SETUP_SSH = _autoconf.TOOLSDIR + "/setup-ssh"
-XM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xm-console-wrapper"
+PREPARE_NODE_JOIN = _autoconf.PKGLIBDIR + "/prepare-node-join"
+XEN_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xen-console-wrapper"
+ETC_HOSTS = vcluster.ETC_HOSTS
 
 # Top-level paths
 DATA_DIR = LOCALSTATEDIR + "/lib/ganeti"
@@ -87,6 +88,10 @@ USER_SCRIPTS_DIR = CONF_DIR + "/scripts"
 VNC_PASSWORD_FILE = CONF_DIR + "/vnc-cluster-password"
 HOOKS_BASE_DIR = CONF_DIR + "/hooks"
 FILE_STORAGE_PATHS_FILE = CONF_DIR + "/file-storage-paths"
+RESTRICTED_COMMANDS_DIR = CONF_DIR + "/restricted-commands"
+
+#: Locked in exclusive mode while noded verifies a remote command
+RESTRICTED_COMMANDS_LOCK_FILE = LOCK_DIR + "/ganeti-restricted-commands.lock"
 
 #: Lock file for watcher, locked in shared mode by watcher; lock in exclusive
 # mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call}
@@ -137,4 +142,3 @@ def GetLogFilename(daemon_name):
 LOG_WATCHER = GetLogFilename("watcher")
 LOG_COMMANDS = GetLogFilename("commands")
 LOG_BURNIN = GetLogFilename("burnin")
-LOG_SETUP_SSH = GetLogFilename("setup-ssh")