Remove fping as a dependency for Ganeti.

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 1594029..61f278e 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007 Google Inc.
@@ -25,7 +25,7 @@ from ganeti import _autoconf
 
 # various versions
 CONFIG_VERSION = 3
-PROTOCOL_VERSION = 2
+PROTOCOL_VERSION = 3
 RELEASE_VERSION = _autoconf.PACKAGE_VERSION
 OS_API_VERSION = 5
 EXPORT_VERSION = 0
@@ -35,7 +35,7 @@ EXPORT_VERSION = 0
 DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
 CLUSTER_CONF_FILE = DATA_DIR + "/config.data"
 SSL_CERT_FILE = DATA_DIR + "/server.pem"
-WATCHER_STATEFILE = DATA_DIR + "/restart_state"
+WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
@@ -48,12 +48,16 @@ MASTER_SCRIPT = "ganeti-master"
 LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti"
 LOG_OS_DIR = LOG_DIR + "/os"
 LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
+LOG_WATCHER = LOG_DIR + "/watcher.log"
 
-OS_DIR = "/srv/ganeti/os"
+OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR
 
 EXPORT_CONF_FILE = "config.ini"
 
+XEN_KERNEL = _autoconf.XEN_KERNEL
+XEN_INITRD = _autoconf.XEN_INITRD
+
 # hooks-related constants
 HOOKS_BASE_DIR = _autoconf.SYSCONFDIR + "/ganeti/hooks"
 HOOKS_PHASE_PRE = "pre"
@@ -87,8 +91,10 @@ INISECT_EXP = "export"
 INISECT_INS = "instance"
 
 # common exit codes
+EXIT_SUCCESS = 0
 EXIT_NOTMASTER = 11
 EXIT_NODESETUP_ERROR = 12
+EXIT_CONFIRMATION = 13 # need user confirmation
 
 # tags
 TAG_CLUSTER = "cluster"
@@ -100,3 +106,5 @@ MAX_TAGS_PER_OBJ = 4096
 # others
 DEFAULT_BRIDGE = "xen-br0"
 SYNC_SPEED = 30 * 1024
+LOCALHOST_IP_ADDRESS="127.0.0.1"
+TCP_PING_TIMEOUT = 10