Revision 880478f8 lib/constants.py

b/lib/constants.py
32 32
# file paths
33 33
DATA_DIR = "/var/lib/ganeti"
34 34
CLUSTER_CONF_FILE = DATA_DIR + "/config.data"
35
CLUSTER_NAME_FILE = DATA_DIR + "/cluster-name"
36 35
SSL_CERT_FILE = DATA_DIR + "/server.pem"
37 36
HYPERCONF_FILE = DATA_DIR + "/hypervisor"
38 37
WATCHER_STATEFILE = DATA_DIR + "/restart_state"
......
46 45
DEFAULT_NODED_PORT = 1811
47 46
FIRST_DRBD_PORT = 11000
48 47
LAST_DRBD_PORT = 14999
49
MASTER_INITD_SCRIPT = "/etc/init.d/ganeti-master"
50
MASTER_INITD_NAME = "ganeti-master"
48
MASTER_SCRIPT = "ganeti-master"
51 49

  
52 50
LOG_DIR = "/var/log/ganeti"
53 51
LOG_OS_DIR = LOG_DIR + "/os"
......
101 99
                      MASTER_CRON_FILE,
102 100
                      ]
103 101

  
104
MASTER_CONFIGFILES = [MASTER_CRON_LINK,
105
                      "/etc/rc2.d/S21%s" % MASTER_INITD_NAME]
102
MASTER_CONFIGFILES = [MASTER_CRON_LINK,]
106 103

  
107 104
NODE_CONFIGFILES = [NODE_INITD_SCRIPT,
108 105
                    "/etc/rc2.d/S20%s" % NODE_INITD_NAME,

Also available in: Unified diff