Revision 2b4701f4 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
82 81

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

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

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

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

  
761 753
  mnh = opts.maintain_node_health
762 754

  
......
785 777
                                  os_hvp=None,
786 778
                                  beparams=beparams,
787 779
                                  nicparams=nicparams,
788
                                  ndparams=ndparams,
789 780
                                  candidate_pool_size=opts.candidate_pool_size,
790 781
                                  maintain_node_health=mnh,
791 782
                                  uid_pool=uid_pool,
......
877 868
     NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
878 869
     SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
879 870
     UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
880
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
881
     NODE_PARAMS_OPT],
871
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT],
882 872
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
883 873
  'destroy': (
884 874
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
......
954 944
     NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
955 945
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
956 946
     NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT,
957
     DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT],
947
     DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT],
958 948
    "[opts...]",
959 949
    "Alters the parameters of the cluster"),
960 950
  "renew-crypto": (

Also available in: Unified diff