Revision c074a9e8 lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
194 194

  
195 195
  hv_state = dict(opts.hv_state)
196 196

  
197
  enabled_storage_types = opts.enabled_storage_types
198
  if enabled_storage_types is not None:
199
    enabled_storage_types = enabled_storage_types.split(",")
200
  else:
201
    enabled_storage_types = list(constants.DEFAULT_ENABLED_STORAGE_TYPES)
202

  
197 203
  bootstrap.InitCluster(cluster_name=args[0],
198 204
                        secondary_ip=opts.secondary_ip,
199 205
                        vg_name=vg_name,
......
221 227
                        use_external_mip_script=external_ip_setup_script,
222 228
                        hv_state=hv_state,
223 229
                        disk_state=disk_state,
230
                        enabled_storage_types=enabled_storage_types,
224 231
                        )
225 232
  op = opcodes.OpClusterPostInit()
226 233
  SubmitOpCode(op, opts=opts)
......
1495 1502
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
1496 1503
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
1497 1504
     NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
1498
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT] + INSTANCE_POLICY_OPTS,
1505
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, ENABLED_STORAGE_TYPES_OPT]
1506
     + INSTANCE_POLICY_OPTS,
1499 1507
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
1500 1508
  "destroy": (
1501 1509
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],

Also available in: Unified diff