Commit 2b4701f4 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Revert "Adding ndparams to gnt-cluster init|modify and man page"

This reverts commit cb1ef973

. QA was
broken by this commit.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent fdd9ac5b
......@@ -78,7 +78,6 @@ def InitCluster(opts, args):
hvparams = dict(opts.hvparams)
beparams = opts.beparams
nicparams = opts.nicparams
ndparams = opts.ndparams
# prepare beparams dict
beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams)
......@@ -88,10 +87,6 @@ def InitCluster(opts, args):
nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams)
utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
# prepare ndparams dict
ndparams = objects.FillDict(constants.NDC_DEFAULTS, ndparams)
utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
# prepare hvparams dict
for hv in constants.HYPER_TYPES:
if hv not in hvparams:
......@@ -128,7 +123,6 @@ def InitCluster(opts, args):
hvparams=hvparams,
beparams=beparams,
nicparams=nicparams,
ndparams=ndparams,
candidate_pool_size=opts.candidate_pool_size,
modify_etc_hosts=opts.modify_etc_hosts,
modify_ssh_setup=opts.modify_ssh_setup,
......@@ -712,7 +706,7 @@ def SetClusterParams(opts, args):
if not (not opts.lvm_storage or opts.vg_name or
not opts.drbd_storage or opts.drbd_helper or
opts.enabled_hypervisors or opts.hvparams or
opts.beparams or opts.nicparams or opts.ndparams or
opts.beparams or opts.nicparams or
opts.candidate_pool_size is not None or
opts.uid_pool is not None or
opts.maintain_node_health is not None or
......@@ -755,8 +749,6 @@ def SetClusterParams(opts, args):
nicparams = opts.nicparams
utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
ndparams = opts.ndparams
utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
mnh = opts.maintain_node_health
......@@ -785,7 +777,6 @@ def SetClusterParams(opts, args):
os_hvp=None,
beparams=beparams,
nicparams=nicparams,
ndparams=ndparams,
candidate_pool_size=opts.candidate_pool_size,
maintain_node_health=mnh,
uid_pool=uid_pool,
......@@ -877,8 +868,7 @@ commands = {
NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
NODE_PARAMS_OPT],
DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT],
"[opts...] <cluster_name>", "Initialises a new cluster configuration"),
'destroy': (
DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
......@@ -954,7 +944,7 @@ commands = {
NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT,
DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT],
DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT],
"[opts...]",
"Alters the parameters of the cluster"),
"renew-crypto": (
......
......@@ -134,7 +134,6 @@ INIT
| [-I *default instance allocator*]
| [--primary-ip-version *version*]
| [--prealloc-wipe-disks {yes \| no}]
| [--node-parameters *ndparams*]
| {*clustername*}
This commands is only run once initially on the first node of the
......@@ -324,10 +323,6 @@ for the primary address. Possible values are 4 and 6 for IPv4 and
IPv6, respectively. This option is used when resolving node names
and the cluster name.
The ``--node-parameters`` option allows you to set default node
parameters for the cluster. Please see **ganeti**(7) for more
information about supported key=value pairs.
LIST-TAGS
~~~~~~~~~
......@@ -383,15 +378,14 @@ MODIFY
| [--prealloc-wipe-disks {yes \| no}]
| [-I *default instance allocator*]
| [--reserved-lvs=*NAMES*]
| [--node-parameters *ndparams*]
Modify the options for the cluster.
The ``--vg-name``, ``--no-lvm-storarge``, ``--enabled-hypervisors``,
``--hypervisor-parameters``, ``--backend-parameters``,
``--nic-parameters``, ``--maintain-node-health``,
``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters`` options
are described in the **init** command.
The ``--vg-name``, ``--no-lvm-storarge``,
``--enabled-hypervisors``, ``--hypervisor-parameters``,
``--backend-parameters``, ``--nic-parameters``,
``--maintain-node-health``, ``--prealloc-wipe-disks``,
``--uid-pool`` options are described in the **init** command.
The ``-C`` option specifies the ``candidate_pool_size`` cluster
parameter. This is the number of nodes that the master will try to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment