Revision 0359e5d0 lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
264 264

  
265 265
  hv_state = dict(opts.hv_state)
266 266

  
267
  default_ialloc_params = opts.default_iallocator_params
267 268
  bootstrap.InitCluster(cluster_name=args[0],
268 269
                        secondary_ip=opts.secondary_ip,
269 270
                        vg_name=vg_name,
......
286 287
                        drbd_helper=drbd_helper,
287 288
                        uid_pool=uid_pool,
288 289
                        default_iallocator=opts.default_iallocator,
290
                        default_iallocator_params=default_ialloc_params,
289 291
                        primary_ip_version=primary_ip_version,
290 292
                        prealloc_wipe_disks=opts.prealloc_wipe_disks,
291 293
                        use_external_mip_script=external_ip_setup_script,
......
524 526
      ("maintenance of node health", result["maintain_node_health"]),
525 527
      ("uid pool", uidpool.FormatUidPool(result["uid_pool"])),
526 528
      ("default instance allocator", result["default_iallocator"]),
529
      ("default instance allocator parameters",
530
       result["default_iallocator_params"]),
527 531
      ("primary ip version", result["primary_ip_version"]),
528 532
      ("preallocation wipe disks", result["prealloc_wipe_disks"]),
529 533
      ("OS search path", utils.CommaJoin(pathutils.OS_SEARCH_PATH)),
......
1078 1082
          opts.add_uids is not None or
1079 1083
          opts.remove_uids is not None or
1080 1084
          opts.default_iallocator is not None or
1085
          opts.default_iallocator_params or
1081 1086
          opts.reserved_lvs is not None or
1082 1087
          opts.master_netdev is not None or
1083 1088
          opts.master_netmask is not None or
......
1191 1196
    add_uids=add_uids,
1192 1197
    remove_uids=remove_uids,
1193 1198
    default_iallocator=opts.default_iallocator,
1199
    default_iallocator_params=opts.default_iallocator_params,
1194 1200
    prealloc_wipe_disks=opts.prealloc_wipe_disks,
1195 1201
    master_netdev=opts.master_netdev,
1196 1202
    master_netmask=opts.master_netmask,
......
2032 2038
     HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT, MASTER_NETMASK_OPT,
2033 2039
     NIC_PARAMS_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
2034 2040
     SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT,
2035
     DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT,
2036
     PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT,
2037
     USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT,
2038
     ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT]
2041
     DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, DEFAULT_IALLOCATOR_PARAMS_OPT,
2042
     PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT,
2043
     GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT,
2044
     HV_STATE_OPT, DISK_STATE_OPT, ENABLED_DISK_TEMPLATES_OPT,
2045
     IPOLICY_STD_SPECS_OPT]
2039 2046
     + INSTANCE_POLICY_OPTS + SPLIT_ISPECS_OPTS,
2040 2047
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
2041 2048
  "destroy": (
......
2113 2120
     BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT,
2114 2121
     MASTER_NETMASK_OPT, NIC_PARAMS_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
2115 2122
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
2116
     DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT,
2117
     PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT,
2118
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT] + SUBMIT_OPTS +
2123
     DEFAULT_IALLOCATOR_OPT, DEFAULT_IALLOCATOR_PARAMS_OPT, RESERVED_LVS_OPT,
2124
     DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, NODE_PARAMS_OPT,
2125
     USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT] +
2126
     SUBMIT_OPTS +
2119 2127
     [ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT, MODIFY_ETCHOSTS_OPT] +
2120 2128
     INSTANCE_POLICY_OPTS + [GLOBAL_FILEDIR_OPT],
2121 2129
    "[opts...]",

Also available in: Unified diff