Revision 2dcb5a26
| b/Makefile.am | ||
|---|---|---|
| 1576 | 1576 |
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ |
| 1577 | 1577 |
echo "XEN_INITRD = '$(XEN_INITRD)'"; \ |
| 1578 | 1578 |
echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ |
| 1579 |
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \ |
|
| 1580 | 1579 |
echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ |
| 1581 | 1580 |
echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \ |
| 1582 | 1581 |
echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \ |
| b/configure.ac | ||
|---|---|---|
| 128 | 128 |
[kvm_kernel="/boot/vmlinuz-3-kvmU"]) |
| 129 | 129 |
AC_SUBST(KVM_KERNEL, $kvm_kernel) |
| 130 | 130 |
|
| 131 |
# --with-file-storage-dir=... |
|
| 132 |
AC_ARG_WITH([file-storage-dir], |
|
| 133 |
[AS_HELP_STRING([--with-file-storage-dir=PATH], |
|
| 134 |
[directory to store files for file-based backend] |
|
| 135 |
[ (default is /srv/ganeti/file-storage)] |
|
| 136 |
)], |
|
| 137 |
[[file_storage_dir="/srv/ganeti/file-storage"]]) |
|
| 138 |
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) |
|
| 139 |
|
|
| 140 | 131 |
# --with-shared-file-storage-dir=... |
| 141 | 132 |
AC_ARG_WITH([shared-file-storage-dir], |
| 142 | 133 |
[AS_HELP_STRING([--with-shared-file-storage-dir=PATH], |
| b/lib/pathutils.py | ||
|---|---|---|
| 28 | 28 |
from ganeti import vcluster |
| 29 | 29 |
|
| 30 | 30 |
|
| 31 |
# FIXME: remove autoconf override |
|
| 32 |
DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage" |
|
| 33 |
|
|
| 34 | 31 |
# Build-time constants |
| 35 |
# FIXME: remove autoconf storage dir |
|
| 36 |
if _autoconf.FILE_STORAGE_DIR: |
|
| 37 |
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR |
|
| 32 |
DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage" |
|
| 38 | 33 |
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(DEFAULT_FILE_STORAGE_DIR) |
| 39 | 34 |
|
| 40 | 35 |
if _autoconf.ENABLE_SHARED_FILE_STORAGE: |
| b/test/hs/Test/Ganeti/Types.hs | ||
|---|---|---|
| 83 | 83 |
allDiskTemplates :: [DiskTemplate] |
| 84 | 84 |
allDiskTemplates = |
| 85 | 85 |
let all_vals = [minBound..maxBound]::[DiskTemplate] |
| 86 |
sel1 = if C.enableFileStorage |
|
| 86 |
sel1 = if C.enableSharedFileStorage
|
|
| 87 | 87 |
then all_vals |
| 88 |
else delete DTFile all_vals |
|
| 89 |
sel2 = if C.enableSharedFileStorage |
|
| 90 |
then sel1 |
|
| 91 |
else delete DTSharedFile sel1 |
|
| 92 |
in sel2 |
|
| 88 |
else delete DTSharedFile all_vals |
|
| 89 |
in sel1 |
|
| 93 | 90 |
|
| 94 | 91 |
-- | Custom 'Arbitrary' instance for 'DiskTemplate', which needs to |
| 95 | 92 |
-- handle the case of file storage being disabled at configure time. |
| ... | ... | |
| 114 | 111 |
|
| 115 | 112 |
-- | Valid storage types. |
| 116 | 113 |
allStorageTypes :: [StorageType] |
| 117 |
allStorageTypes = |
|
| 118 |
let all_vals = [minBound..maxBound]::[StorageType] |
|
| 119 |
in if C.enableFileStorage |
|
| 120 |
then all_vals |
|
| 121 |
else delete StorageFile all_vals |
|
| 114 |
allStorageTypes = [minBound..maxBound]::[StorageType] |
|
| 122 | 115 |
|
| 123 | 116 |
-- | Custom 'Arbitrary' instance for 'StorageType', which needs to |
| 124 | 117 |
-- handle the case of file storage being disabled at configure time. |
Also available in: Unified diff