Revision b8669a69 lib/pathutils.py
b/lib/pathutils.py | ||
---|---|---|
23 | 23 |
|
24 | 24 |
""" |
25 | 25 |
|
26 |
from ganeti import _autoconf |
|
27 | 26 |
from ganeti import _constants |
28 | 27 |
from ganeti import compat |
29 | 28 |
from ganeti import vcluster |
... | ... | |
35 | 34 |
DEFAULT_SHARED_FILE_STORAGE_DIR = "/srv/ganeti/shared-file-storage" |
36 | 35 |
DEFAULT_SHARED_FILE_STORAGE_DIR = \ |
37 | 36 |
vcluster.AddNodePrefix(DEFAULT_SHARED_FILE_STORAGE_DIR) |
38 |
EXPORT_DIR = vcluster.AddNodePrefix(_autoconf.EXPORT_DIR)
|
|
37 |
EXPORT_DIR = vcluster.AddNodePrefix(_constants.EXPORT_DIR)
|
|
39 | 38 |
OS_SEARCH_PATH = _constants.OS_SEARCH_PATH |
40 | 39 |
ES_SEARCH_PATH = _constants.ES_SEARCH_PATH |
41 |
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR
|
|
42 |
XEN_CONFIG_DIR = vcluster.AddNodePrefix(_autoconf.XEN_CONFIG_DIR)
|
|
43 |
SYSCONFDIR = vcluster.AddNodePrefix(_autoconf.SYSCONFDIR)
|
|
44 |
TOOLSDIR = _autoconf.TOOLSDIR
|
|
45 |
LOCALSTATEDIR = vcluster.AddNodePrefix(_autoconf.LOCALSTATEDIR)
|
|
40 |
SSH_CONFIG_DIR = _constants.SSH_CONFIG_DIR
|
|
41 |
XEN_CONFIG_DIR = vcluster.AddNodePrefix(_constants.XEN_CONFIG_DIR)
|
|
42 |
SYSCONFDIR = vcluster.AddNodePrefix(_constants.SYSCONFDIR)
|
|
43 |
TOOLSDIR = _constants.TOOLSDIR
|
|
44 |
LOCALSTATEDIR = vcluster.AddNodePrefix(_constants.LOCALSTATEDIR)
|
|
46 | 45 |
|
47 | 46 |
# Paths which don't change for a virtual cluster |
48 |
DAEMON_UTIL = _autoconf.PKGLIBDIR + "/daemon-util"
|
|
49 |
IMPORT_EXPORT_DAEMON = _autoconf.PKGLIBDIR + "/import-export"
|
|
50 |
KVM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/kvm-console-wrapper"
|
|
51 |
KVM_IFUP = _autoconf.PKGLIBDIR + "/kvm-ifup"
|
|
52 |
PREPARE_NODE_JOIN = _autoconf.PKGLIBDIR + "/prepare-node-join"
|
|
53 |
NODE_DAEMON_SETUP = _autoconf.PKGLIBDIR + "/node-daemon-setup"
|
|
54 |
XEN_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xen-console-wrapper"
|
|
47 |
DAEMON_UTIL = _constants.PKGLIBDIR + "/daemon-util"
|
|
48 |
IMPORT_EXPORT_DAEMON = _constants.PKGLIBDIR + "/import-export"
|
|
49 |
KVM_CONSOLE_WRAPPER = _constants.PKGLIBDIR + "/tools/kvm-console-wrapper"
|
|
50 |
KVM_IFUP = _constants.PKGLIBDIR + "/kvm-ifup"
|
|
51 |
PREPARE_NODE_JOIN = _constants.PKGLIBDIR + "/prepare-node-join"
|
|
52 |
NODE_DAEMON_SETUP = _constants.PKGLIBDIR + "/node-daemon-setup"
|
|
53 |
XEN_CONSOLE_WRAPPER = _constants.PKGLIBDIR + "/tools/xen-console-wrapper"
|
|
55 | 54 |
ETC_HOSTS = vcluster.ETC_HOSTS |
56 | 55 |
|
57 | 56 |
# Top-level paths |
Also available in: Unified diff