Revision 49a924bc lib/pathutils.py
b/lib/pathutils.py | ||
---|---|---|
32 | 32 |
DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage" |
33 | 33 |
|
34 | 34 |
# Build-time constants |
35 |
if _autoconf.ENABLE_FILE_STORAGE: |
|
36 |
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(_autoconf.FILE_STORAGE_DIR) |
|
37 |
else: |
|
35 |
# FIXME: remove autoconf storage dir |
|
36 |
if _autoconf.FILE_STORAGE_DIR: |
|
38 | 37 |
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR |
38 |
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(DEFAULT_FILE_STORAGE_DIR) |
|
39 |
|
|
39 | 40 |
if _autoconf.ENABLE_SHARED_FILE_STORAGE: |
40 | 41 |
DEFAULT_SHARED_FILE_STORAGE_DIR = \ |
41 | 42 |
vcluster.AddNodePrefix(_autoconf.SHARED_FILE_STORAGE_DIR) |
Also available in: Unified diff