Revision d48c944b qa/qa_cluster.py
| 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", |
Also available in: Unified diff