Revision cb1ef973 lib/client/gnt_cluster.py
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": ( |
Also available in: Unified diff