Revision d48c944b
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 87 | 87 |
" to disable lvm-based storage cluster-wide, use the option" |
| 88 | 88 |
" --enabled-disk-templates to disable all of these lvm-base disk " |
| 89 | 89 |
" templates: %s" % |
| 90 |
utils.CommaJoin(utils.GetLvmDiskTemplates()))
|
|
| 90 |
utils.CommaJoin(constants.DTS_LVM))
|
|
| 91 | 91 |
return 1 |
| 92 | 92 |
|
| 93 | 93 |
|
| ... | ... | |
| 1048 | 1048 |
if vg_name and not utils.IsLvmEnabled(enabled_disk_templates): |
| 1049 | 1049 |
ToStdout("You specified a volume group with --vg-name, but you did not"
|
| 1050 | 1050 |
" enable any of the following lvm-based disk templates: %s" % |
| 1051 |
utils.CommaJoin(utils.GetLvmDiskTemplates()))
|
|
| 1051 |
utils.CommaJoin(constants.DTS_LVM))
|
|
| 1052 | 1052 |
return vg_name |
| 1053 | 1053 |
|
| 1054 | 1054 |
|
| b/lib/cmdlib/instance.py | ||
|---|---|---|
| 1090 | 1090 |
elif self.op.disk_template == constants.DT_EXT: |
| 1091 | 1091 |
# FIXME: Function that checks prereqs if needed |
| 1092 | 1092 |
pass |
| 1093 |
elif self.op.disk_template in utils.GetLvmDiskTemplates():
|
|
| 1093 |
elif self.op.disk_template in constants.DTS_LVM:
|
|
| 1094 | 1094 |
# Check lv size requirements, if not adopting |
| 1095 | 1095 |
req_sizes = ComputeDiskSizePerVG(self.op.disk_template, self.disks) |
| 1096 | 1096 |
CheckNodesFreeDiskPerVG(self, node_uuids, req_sizes) |
| b/lib/utils/storage.py | ||
|---|---|---|
| 34 | 34 |
if constants.MAP_DISK_TEMPLATE_STORAGE_TYPE[dt] == storage_type] |
| 35 | 35 |
|
| 36 | 36 |
|
| 37 |
def GetLvmDiskTemplates(): |
|
| 38 |
"""Returns all disk templates that use LVM.""" |
|
| 39 |
return GetDiskTemplatesOfStorageType(constants.ST_LVM_VG) |
|
| 40 |
|
|
| 41 |
|
|
| 42 | 37 |
def IsDiskTemplateEnabled(disk_template, enabled_disk_templates): |
| 43 | 38 |
"""Checks if a particular disk template is enabled. |
| 44 | 39 |
|
| ... | ... | |
| 62 | 57 |
|
| 63 | 58 |
def IsLvmEnabled(enabled_disk_templates): |
| 64 | 59 |
"""Check whether or not any lvm-based disk templates are enabled.""" |
| 65 |
return len(set(GetLvmDiskTemplates()) |
|
| 66 |
.intersection(set(enabled_disk_templates))) != 0 |
|
| 60 |
return len(constants.DTS_LVM & set(enabled_disk_templates)) != 0 |
|
| 67 | 61 |
|
| 68 | 62 |
|
| 69 | 63 |
def LvmGetsEnabled(enabled_disk_templates, new_enabled_disk_templates): |
| ... | ... | |
| 73 | 67 |
""" |
| 74 | 68 |
if IsLvmEnabled(enabled_disk_templates): |
| 75 | 69 |
return False |
| 76 |
return set(GetLvmDiskTemplates()).intersection( |
|
| 77 |
set(new_enabled_disk_templates)) |
|
| 70 |
return len(constants.DTS_LVM & set(new_enabled_disk_templates)) != 0 |
|
| 78 | 71 |
|
| 79 | 72 |
|
| 80 | 73 |
def _GetDefaultStorageUnitForDiskTemplate(cfg, disk_template): |
| ... | ... | |
| 92 | 85 |
""" |
| 93 | 86 |
storage_type = constants.MAP_DISK_TEMPLATE_STORAGE_TYPE[disk_template] |
| 94 | 87 |
cluster = cfg.GetClusterInfo() |
| 95 |
if disk_template in GetLvmDiskTemplates():
|
|
| 88 |
if disk_template in constants.DTS_LVM:
|
|
| 96 | 89 |
return (storage_type, cfg.GetVGName()) |
| 97 | 90 |
elif disk_template == constants.DT_FILE: |
| 98 | 91 |
return (storage_type, cluster.file_storage_dir) |
| b/qa/qa_cluster.py | ||
|---|---|---|
| 684 | 684 |
return |
| 685 | 685 |
|
| 686 | 686 |
# determine an LVM and a non-LVM disk template for the tests |
| 687 |
non_lvm_template = _GetOtherEnabledDiskTemplate(utils.GetLvmDiskTemplates(),
|
|
| 687 |
non_lvm_template = _GetOtherEnabledDiskTemplate(constants.DTS_LVM,
|
|
| 688 | 688 |
enabled_disk_templates) |
| 689 |
lvm_template = list(set(enabled_disk_templates) |
|
| 690 |
.intersection(set(utils.GetLvmDiskTemplates())))[0] |
|
| 689 |
lvm_template = list(set(enabled_disk_templates) & constants.DTS_LVM)[0] |
|
| 691 | 690 |
|
| 692 | 691 |
vgname = qa_config.get("vg-name", constants.DEFAULT_VG)
|
| 693 | 692 |
|
| ... | ... | |
| 783 | 782 |
all_disk_templates = constants.DISK_TEMPLATES |
| 784 | 783 |
if not utils.IsLvmEnabled(qa_config.GetEnabledDiskTemplates()): |
| 785 | 784 |
all_disk_templates = list(set(all_disk_templates) - |
| 786 |
set(utils.GetLvmDiskTemplates()))
|
|
| 785 |
constants.DTS_LVM)
|
|
| 787 | 786 |
|
| 788 | 787 |
AssertCommand( |
| 789 | 788 |
["gnt-cluster", "modify", |
| b/test/py/ganeti.constants_unittest.py | ||
|---|---|---|
| 170 | 170 |
self.assertTrue( |
| 171 | 171 |
constants.MAP_DISK_TEMPLATE_STORAGE_TYPE[disk_template] is not None) |
| 172 | 172 |
|
| 173 |
def testLvmDiskTemplates(self): |
|
| 174 |
lvm_by_storage_type = [ |
|
| 175 |
dt for dt in constants.DISK_TEMPLATES |
|
| 176 |
if constants.ST_LVM_VG == constants.MAP_DISK_TEMPLATE_STORAGE_TYPE[dt]] |
|
| 177 |
self.assertEqual(set(lvm_by_storage_type), set(constants.DTS_LVM)) |
|
| 178 |
|
|
| 173 | 179 |
|
| 174 | 180 |
if __name__ == "__main__": |
| 175 | 181 |
testutils.GanetiTestProgram() |
Also available in: Unified diff