Revision cffbbae7 lib/pathutils.py

b/lib/pathutils.py
24 24
"""
25 25

  
26 26
from ganeti import _autoconf
27
from ganeti import vcluster
28

  
27 29

  
28 30
# Build-time constants
29
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
30
DEFAULT_SHARED_FILE_STORAGE_DIR = _autoconf.SHARED_FILE_STORAGE_DIR
31
EXPORT_DIR = _autoconf.EXPORT_DIR
31
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(_autoconf.FILE_STORAGE_DIR)
32
DEFAULT_SHARED_FILE_STORAGE_DIR = \
33
  vcluster.AddNodePrefix(_autoconf.SHARED_FILE_STORAGE_DIR)
34
EXPORT_DIR = vcluster.AddNodePrefix(_autoconf.EXPORT_DIR)
32 35
OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
33 36
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR
34
SYSCONFDIR = _autoconf.SYSCONFDIR
37
SYSCONFDIR = vcluster.AddNodePrefix(_autoconf.SYSCONFDIR)
35 38
TOOLSDIR = _autoconf.TOOLSDIR
39
LOCALSTATEDIR = vcluster.AddNodePrefix(_autoconf.LOCALSTATEDIR)
36 40

  
37 41
# Paths which don't change for a virtual cluster
38 42
DAEMON_UTIL = _autoconf.PKGLIBDIR + "/daemon-util"
......
43 47
XM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xm-console-wrapper"
44 48

  
45 49
# Top-level paths
46
DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
47
LOCK_DIR = _autoconf.LOCALSTATEDIR + "/lock"
48
LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti"
49
RUN_DIR = _autoconf.LOCALSTATEDIR + "/run/ganeti"
50
DATA_DIR = LOCALSTATEDIR + "/lib/ganeti"
51
LOCK_DIR = LOCALSTATEDIR + "/lock"
52
LOG_DIR = LOCALSTATEDIR + "/log/ganeti"
53
RUN_DIR = LOCALSTATEDIR + "/run/ganeti"
50 54

  
51 55
#: Script to configure master IP address
52 56
DEFAULT_MASTER_SETUP_SCRIPT = TOOLSDIR + "/master-ip-setup"

Also available in: Unified diff