Revision 085e0d9f lib/client/gnt_node.py

b/lib/client/gnt_node.py
216 216

  
217 217
  bootstrap.SetupNodeDaemon(cluster_name, node, opts.ssh_key_check)
218 218

  
219
  if opts.disk_state:
220
    disk_state = utils.FlatToDict(opts.disk_state)
221
  else:
222
    disk_state = {}
223

  
224
  hv_state = dict(opts.hv_state)
225

  
219 226
  op = opcodes.OpNodeAdd(node_name=args[0], secondary_ip=sip,
220 227
                         readd=opts.readd, group=opts.nodegroup,
221 228
                         vm_capable=opts.vm_capable, ndparams=opts.ndparams,
222
                         master_capable=opts.master_capable)
229
                         master_capable=opts.master_capable,
230
                         disk_state=disk_state,
231
                         hv_state=hv_state)
223 232
  SubmitOpCode(op, opts=opts)
224 233

  
225 234

  
......
868 877
    AddNode, [ArgHost(min=1, max=1)],
869 878
    [SECONDARY_IP_OPT, READD_OPT, NOSSH_KEYCHECK_OPT, NODE_FORCE_JOIN_OPT,
870 879
     NONODE_SETUP_OPT, VERBOSE_OPT, NODEGROUP_OPT, PRIORITY_OPT,
871
     CAPAB_MASTER_OPT, CAPAB_VM_OPT, NODE_PARAMS_OPT],
880
     CAPAB_MASTER_OPT, CAPAB_VM_OPT, NODE_PARAMS_OPT, HV_STATE_OPT,
881
     DISK_STATE_OPT],
872 882
    "[-s ip] [--readd] [--no-ssh-key-check] [--force-join]"
873 883
    " [--no-node-setup] [--verbose]"
874 884
    " <node_name>",

Also available in: Unified diff