Revision 4e6cfd11
b/lib/cli.py | ||
---|---|---|
1308 | 1308 |
help="Specify the default directory (cluster-wide) for storing the" |
1309 | 1309 |
" shared file-based disks [%s]" % |
1310 | 1310 |
pathutils.DEFAULT_SHARED_FILE_STORAGE_DIR, |
1311 |
metavar="SHAREDDIR", default=pathutils.DEFAULT_SHARED_FILE_STORAGE_DIR)
|
|
1311 |
metavar="SHAREDDIR", default=None)
|
|
1312 | 1312 |
|
1313 | 1313 |
NOMODIFY_ETCHOSTS_OPT = cli_option("--no-etc-hosts", dest="modify_etc_hosts", |
1314 | 1314 |
help="Don't modify %s" % pathutils.ETC_HOSTS, |
b/lib/cmdlib/cluster.py | ||
---|---|---|
818 | 818 |
CheckFileStoragePathVsEnabledDiskTemplates( |
819 | 819 |
self.LogWarning, self.op.file_storage_dir, enabled_disk_templates) |
820 | 820 |
|
821 |
if self.op.shared_file_storage_dir is not None: |
|
822 |
CheckSharedFileStoragePathVsEnabledDiskTemplates( |
|
823 |
self.LogWarning, self.op.shared_file_storage_dir, |
|
824 |
enabled_disk_templates) |
|
825 |
|
|
821 | 826 |
if self.op.drbd_helper: |
822 | 827 |
# checks given drbd helper on all nodes |
823 | 828 |
helpers = self.rpc.call_drbd_helper(node_uuids) |
b/lib/opcodes.py | ||
---|---|---|
951 | 951 |
"Whether the cluster can modify and keep in sync the /etc/hosts files"), |
952 | 952 |
("file_storage_dir", None, ht.TMaybeString, |
953 | 953 |
"Default directory for storing file-backed disks"), |
954 |
("shared_file_storage_dir", None, ht.TMaybeString, |
|
955 |
"Default directory for storing shared-file-backed disks"), |
|
954 | 956 |
] |
955 | 957 |
OP_RESULT = ht.TNone |
956 | 958 |
|
b/lib/utils/storage.py | ||
---|---|---|
25 | 25 |
import logging |
26 | 26 |
|
27 | 27 |
from ganeti import constants |
28 |
from ganeti import pathutils |
|
29 | 28 |
|
30 | 29 |
|
31 | 30 |
def GetDiskTemplatesOfStorageType(storage_type): |
b/src/Ganeti/OpCodes.hs | ||
---|---|---|
186 | 186 |
, pEnabledDiskTemplates |
187 | 187 |
, pModifyEtcHosts |
188 | 188 |
, pGlobalFileStorageDir |
189 |
, pGlobalSharedFileStorageDir |
|
189 | 190 |
]) |
190 | 191 |
, ("OpClusterRedistConf", []) |
191 | 192 |
, ("OpClusterActivateMasterIp", []) |
b/src/Ganeti/OpParams.hs | ||
---|---|---|
106 | 106 |
, pFileDriver |
107 | 107 |
, pFileStorageDir |
108 | 108 |
, pGlobalFileStorageDir |
109 |
, pGlobalSharedFileStorageDir |
|
109 | 110 |
, pVgName |
110 | 111 |
, pEnabledHypervisors |
111 | 112 |
, pHypervisor |
... | ... | |
792 | 793 |
pGlobalFileStorageDir :: Field |
793 | 794 |
pGlobalFileStorageDir = optionalNEStringField "file_storage_dir" |
794 | 795 |
|
796 |
-- | Global directory for storing shared-file-backed disks. |
|
797 |
pGlobalSharedFileStorageDir :: Field |
|
798 |
pGlobalSharedFileStorageDir = optionalNEStringField "shared_file_storage_dir" |
|
799 |
|
|
795 | 800 |
-- | Volume group name. |
796 | 801 |
pVgName :: Field |
797 | 802 |
pVgName = optionalStringField "vg_name" |
b/test/hs/Test/Ganeti/OpCodes.hs | ||
---|---|---|
164 | 164 |
emptyMUD <*> emptyMUD <*> arbitrary <*> |
165 | 165 |
arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> |
166 | 166 |
arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> |
167 |
genMaybe (genName >>= mkNonEmpty) <*> |
|
167 | 168 |
genMaybe (genName >>= mkNonEmpty) |
168 | 169 |
"OP_CLUSTER_REDIST_CONF" -> pure OpCodes.OpClusterRedistConf |
169 | 170 |
"OP_CLUSTER_ACTIVATE_MASTER_IP" -> |
Also available in: Unified diff