Revision c4929a8b lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
180 180
    ToStderr("Invalid master netmask value: %s" % str(err))
181 181
    return 1
182 182

  
183
  if opts.disk_state:
184
    disk_state = utils.FlatToDict(opts.disk_state)
185
  else:
186
    disk_state = {}
187

  
188
  hv_state = dict(opts.hv_state)
189

  
183 190
  bootstrap.InitCluster(cluster_name=args[0],
184 191
                        secondary_ip=opts.secondary_ip,
185 192
                        vg_name=vg_name,
......
205 212
                        primary_ip_version=primary_ip_version,
206 213
                        prealloc_wipe_disks=opts.prealloc_wipe_disks,
207 214
                        use_external_mip_script=external_ip_setup_script,
215
                        hv_state=hv_state,
216
                        disk_state=disk_state,
208 217
                        )
209 218
  op = opcodes.OpClusterPostInit()
210 219
  SubmitOpCode(op, opts=opts)
......
1453 1462
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
1454 1463
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
1455 1464
     NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
1456
     DISK_PARAMS_OPT] + INSTANCE_POLICY_OPTS,
1465
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT] + INSTANCE_POLICY_OPTS,
1457 1466
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
1458 1467
  "destroy": (
1459 1468
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],

Also available in: Unified diff