Revision cb1ef973

b/lib/client/gnt_cluster.py
78 78
  hvparams = dict(opts.hvparams)
79 79
  beparams = opts.beparams
80 80
  nicparams = opts.nicparams
81
  ndparams = opts.ndparams
81 82

  
82 83
  # prepare beparams dict
83 84
  beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams)
......
87 88
  nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams)
88 89
  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
89 90

  
91
  # prepare ndparams dict
92
  ndparams = objects.FillDict(constants.NDC_DEFAULTS, ndparams)
93
  utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
94

  
90 95
  # prepare hvparams dict
91 96
  for hv in constants.HYPER_TYPES:
92 97
    if hv not in hvparams:
......
123 128
                        hvparams=hvparams,
124 129
                        beparams=beparams,
125 130
                        nicparams=nicparams,
131
                        ndparams=ndparams,
126 132
                        candidate_pool_size=opts.candidate_pool_size,
127 133
                        modify_etc_hosts=opts.modify_etc_hosts,
128 134
                        modify_ssh_setup=opts.modify_ssh_setup,
......
706 712
  if not (not opts.lvm_storage or opts.vg_name or
707 713
          not opts.drbd_storage or opts.drbd_helper or
708 714
          opts.enabled_hypervisors or opts.hvparams or
709
          opts.beparams or opts.nicparams or
715
          opts.beparams or opts.nicparams or opts.ndparams or
710 716
          opts.candidate_pool_size is not None or
711 717
          opts.uid_pool is not None or
712 718
          opts.maintain_node_health is not None or
......
749 755
  nicparams = opts.nicparams
750 756
  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
751 757

  
758
  ndparams = opts.ndparams
759
  utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
752 760

  
753 761
  mnh = opts.maintain_node_health
754 762

  
......
777 785
                                  os_hvp=None,
778 786
                                  beparams=beparams,
779 787
                                  nicparams=nicparams,
788
                                  ndparams=ndparams,
780 789
                                  candidate_pool_size=opts.candidate_pool_size,
781 790
                                  maintain_node_health=mnh,
782 791
                                  uid_pool=uid_pool,
......
868 877
     NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
869 878
     SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
870 879
     UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
871
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT],
880
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
881
     NODE_PARAMS_OPT],
872 882
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
873 883
  'destroy': (
874 884
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
......
944 954
     NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
945 955
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
946 956
     NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT,
947
     DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT],
957
     DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT],
948 958
    "[opts...]",
949 959
    "Alters the parameters of the cluster"),
950 960
  "renew-crypto": (
b/man/gnt-cluster.rst
134 134
| [-I *default instance allocator*]
135 135
| [--primary-ip-version *version*]
136 136
| [--prealloc-wipe-disks {yes \| no}]
137
| [--node-parameters *ndparams*]
137 138
| {*clustername*}
138 139

  
139 140
This commands is only run once initially on the first node of the
......
323 324
IPv6, respectively. This option is used when resolving node names
324 325
and the cluster name.
325 326

  
327
The ``--node-parameters`` option allows you to set default node
328
parameters for the cluster. Please see **ganeti**(7) for more
329
information about supported key=value pairs.
330

  
326 331
LIST-TAGS
327 332
~~~~~~~~~
328 333

  
......
378 383
| [--prealloc-wipe-disks {yes \| no}]
379 384
| [-I *default instance allocator*]
380 385
| [--reserved-lvs=*NAMES*]
386
| [--node-parameters *ndparams*]
381 387

  
382 388
Modify the options for the cluster.
383 389

  
384
The ``--vg-name``, ``--no-lvm-storarge``,
385
``--enabled-hypervisors``, ``--hypervisor-parameters``,
386
``--backend-parameters``, ``--nic-parameters``,
387
``--maintain-node-health``, ``--prealloc-wipe-disks``,
388
``--uid-pool`` options are described in the **init** command.
390
The ``--vg-name``, ``--no-lvm-storarge``, ``--enabled-hypervisors``,
391
``--hypervisor-parameters``, ``--backend-parameters``,
392
``--nic-parameters``, ``--maintain-node-health``,
393
``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters`` options
394
are described in the **init** command.
389 395

  
390 396
The ``-C`` option specifies the ``candidate_pool_size`` cluster
391 397
parameter. This is the number of nodes that the master will try to

Also available in: Unified diff