Revision 131178b9 lib/constants.py

b/lib/constants.py
106 106
ETC_HOSTS = "/etc/hosts"
107 107
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
108 108
SYSCONFDIR = _autoconf.SYSCONFDIR
109
CONF_DIR = SYSCONFDIR + "/ganeti"
109 110

  
110 111
MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
111 112

  
112
NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
113
NODE_INITD_SCRIPT = SYSCONFDIR + "/init.d/ganeti"
113 114

  
114 115
NODED = "ganeti-noded"
115 116
CONFD = "ganeti-confd"
......
171 172
VALUE_FALSE = "false"
172 173

  
173 174
# hooks-related constants
174
HOOKS_BASE_DIR = _autoconf.SYSCONFDIR + "/ganeti/hooks"
175
HOOKS_BASE_DIR = CONF_DIR + "/hooks"
175 176
HOOKS_PHASE_PRE = "pre"
176 177
HOOKS_PHASE_POST = "post"
177 178
HOOKS_NAME_CFGUPDATE = "config-update"
......
430 431
HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
431 432

  
432 433
VNC_BASE_PORT = 5900
433
VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
434
VNC_PASSWORD_FILE = CONF_DIR + "/vnc-cluster-password"
434 435
VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
435 436

  
436 437
# NIC types

Also available in: Unified diff