diff --git a/lib/backend.py b/lib/backend.py index 24825c4c882e3e1e88e0772117db2660fd947ad8..75457e36c1cb0f80984eb0848c0389a5d52bd5b5 100644 --- a/lib/backend.py +++ b/lib/backend.py @@ -1598,17 +1598,17 @@ def _OSOndiskAPIVersion(name, os_dir): data holding either the vaid versions or an error message """ - api_file = os.path.sep.join([os_dir, "ganeti_api_version"]) + api_file = os.path.sep.join([os_dir, constants.OS_API_FILE]) try: st = os.stat(api_file) except EnvironmentError, err: - return False, ("Required file 'ganeti_api_version' file not" - " found under path %s: %s" % (os_dir, _ErrnoOrStr(err))) + return False, ("Required file '%s' not found under path %s: %s" % + (constants.OS_API_FILE, os_dir, _ErrnoOrStr(err))) if not stat.S_ISREG(stat.S_IFMT(st.st_mode)): - return False, ("File 'ganeti_api_version' file at %s is not" - " a regular file" % os_dir) + return False, ("File '%s' in %s is not a regular file" % + (constants.OS_API_FILE, os_dir)) try: api_versions = utils.ReadFile(api_file).splitlines() diff --git a/lib/constants.py b/lib/constants.py index 0278cfeee5479dad652458ea9ac9ea84eb4be67b..636832b19fcb1b991ba74bbabbff78a015fc95fb 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -328,6 +328,8 @@ OS_SCRIPT_RENAME = 'rename' OS_SCRIPTS = frozenset([OS_SCRIPT_CREATE, OS_SCRIPT_IMPORT, OS_SCRIPT_EXPORT, OS_SCRIPT_RENAME]) +OS_API_FILE = 'ganeti_api_version' + # ssh constants SSH_INITD_SCRIPT = _autoconf.SSH_INITD_SCRIPT SSH_CONFIG_DIR = "/etc/ssh/"