Revision 3039e2dc qa/qa_cluster.py

b/qa/qa_cluster.py
174 174
    fh.close()
175 175

  
176 176
  # Initialize cluster
177
  enabled_disk_templates = qa_config.GetEnabledDiskTemplates()
177 178
  cmd = [
178 179
    "gnt-cluster", "init",
179 180
    "--primary-ip-version=%d" % qa_config.get("primary_ip_version", 4),
180 181
    "--enabled-hypervisors=%s" % ",".join(qa_config.GetEnabledHypervisors()),
181 182
    "--enabled-disk-templates=%s" %
182
      ",".join(qa_config.GetEnabledDiskTemplates()),
183
    "--file-storage-dir=%s" %
184
      qa_config.get("file-storage-dir", pathutils.DEFAULT_FILE_STORAGE_DIR),
183
      ",".join(enabled_disk_templates),
185 184
    ]
185
  if constants.DT_FILE in enabled_disk_templates:
186
    cmd.append(
187
        "--file-storage-dir=%s" %
188
        qa_config.get("file-storage-dir", pathutils.DEFAULT_FILE_STORAGE_DIR))
186 189

  
187 190
  for spec_type in ("mem-size", "disk-size", "disk-count", "cpu-count",
188 191
                    "nic-count"):

Also available in: Unified diff