Revision 2de59e2c
b/qa/qa_cluster.py | ||
---|---|---|
499 | 499 |
|
500 | 500 |
for fail, cmd in [ |
501 | 501 |
(False, ["gnt-cluster", "modify", |
502 |
"--enabled-disk-templates=%s" % file_disk_template]), |
|
502 |
"--enabled-disk-templates=%s" % file_disk_template, |
|
503 |
"--ipolicy-disk-templates=%s" % file_disk_template]), |
|
503 | 504 |
(False, ["gnt-cluster", "modify", |
504 | 505 |
"--%s=%s" % (option_name, file_storage_dir)]), |
505 | 506 |
(False, ["gnt-cluster", "modify", |
... | ... | |
514 | 515 |
(False, ["gnt-cluster", "modify", |
515 | 516 |
"--%s=%s" % (option_name, file_storage_dir)]), |
516 | 517 |
(False, ["gnt-cluster", "modify", |
517 |
"--enabled-disk-templates=%s" % other_disk_template]), |
|
518 |
"--enabled-disk-templates=%s" % other_disk_template, |
|
519 |
"--ipolicy-disk-templates=%s" % other_disk_template]), |
|
518 | 520 |
(False, ["gnt-cluster", "modify", |
519 | 521 |
"--%s=%s" % (option_name, invalid_file_storage_dir)]), |
520 | 522 |
# file storage is set to an inacceptable path, but file storage |
... | ... | |
527 | 529 |
# resetting everything to sane values |
528 | 530 |
(False, ["gnt-cluster", "modify", |
529 | 531 |
"--%s=%s" % (option_name, file_storage_dir), |
530 |
"--enabled-disk-templates=%s" % ",".join(enabled_disk_templates)]) |
|
532 |
"--enabled-disk-templates=%s" % ",".join(enabled_disk_templates), |
|
533 |
"--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)]) |
|
531 | 534 |
]: |
532 | 535 |
AssertCommand(cmd, fail=fail) |
533 | 536 |
|
Also available in: Unified diff