Revision ae591749 qa/qa_instance.py

b/qa/qa_instance.py
1027 1027
  # Setup the cluster with the enabled_disk_templates
1028 1028
  AssertCommand(
1029 1029
    ["gnt-cluster", "modify",
1030
     "--enabled-disk-template=%s" %
1030
     "--enabled-disk-templates=%s" %
1031 1031
       ",".join(enabled_disk_templates)],
1032 1032
    fail=False)
1033 1033

  
......
1054 1054
    for (enabled, disabled) in [(templates1, templates2),
1055 1055
                                (templates2, templates1)]:
1056 1056
      AssertCommand(["gnt-cluster", "modify",
1057
                     "--enabled-disk-template=%s" %
1057
                     "--enabled-disk-templates=%s" %
1058 1058
                       ",".join(enabled)],
1059 1059
                    fail=False)
1060 1060
      for disk_template in disabled:
......
1067 1067
                             set([constants.DT_DISKLESS, constants.DT_BLOCK]) -
1068 1068
                             set(enabled_disk_templates))
1069 1069
    AssertCommand(["gnt-cluster", "modify",
1070
                   "--enabled-disk-template=%s" %
1070
                   "--enabled-disk-templates=%s" %
1071 1071
                     ",".join(other_disk_templates)],
1072 1072
                  fail=False)
1073 1073
    CreateInstanceByDiskTemplate(nodes, enabled_disk_templates[0], fail=True)
......
1077 1077

  
1078 1078
  # Restore initially enabled disk templates
1079 1079
  AssertCommand(["gnt-cluster", "modify",
1080
                 "--enabled-disk-template=%s" %
1080
                 "--enabled-disk-templates=%s" %
1081 1081
                   ",".join(enabled_disk_templates)],
1082 1082
                 fail=False)

Also available in: Unified diff