Revision d2d3935a lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
150 150 
    ispecs_disk_count=opts.ispecs_disk_count,
151 151 
    ispecs_disk_size=opts.ispecs_disk_size,
152 152 
    ispecs_nic_count=opts.ispecs_nic_count,
153 
    minmax_ispecs=opts.ipolicy_bounds_specs,
154 
    std_ispecs=opts.ipolicy_std_specs,
153 155 
    ipolicy_disk_templates=opts.ipolicy_disk_templates,
154 156 
    ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio,
155 157 
    ipolicy_spindle_ratio=opts.ipolicy_spindle_ratio,
......
969 971 
          opts.ispecs_disk_count or
970 972 
          opts.ispecs_disk_size or
971 973 
          opts.ispecs_nic_count or
974 
          opts.ipolicy_bounds_specs is not None or
975 
          opts.ipolicy_std_specs is not None or
972 976 
          opts.ipolicy_disk_templates is not None or
973 977 
          opts.ipolicy_vcpu_ratio is not None or
974 978 
          opts.ipolicy_spindle_ratio is not None):
......
1025 1029 
    ispecs_disk_count=opts.ispecs_disk_count,
1026 1030 
    ispecs_disk_size=opts.ispecs_disk_size,
1027 1031 
    ispecs_nic_count=opts.ispecs_nic_count,
1032 
    minmax_ispecs=opts.ipolicy_bounds_specs,
1033 
    std_ispecs=opts.ipolicy_std_specs,
1028 1034 
    ipolicy_disk_templates=opts.ipolicy_disk_templates,
1029 1035 
    ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio,
1030 1036 
    ipolicy_spindle_ratio=opts.ipolicy_spindle_ratio,
......
1495 1501 
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
1496 1502 
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
1497 1503 
     NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
1498 
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, ENABLED_DISK_TEMPLATES_OPT]
1499 
     + INSTANCE_POLICY_OPTS,
1504 
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, ENABLED_DISK_TEMPLATES_OPT,
1505 
     IPOLICY_STD_SPECS_OPT] + INSTANCE_POLICY_OPTS,
1500 1506 
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
1501 1507 
  "destroy": (
1502 1508 
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
......
1574 1580 
     DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,
1575 1581 
     RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,
1576 1582 
     NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT,
1577 
     DISK_STATE_OPT, SUBMIT_OPT, ENABLED_DISK_TEMPLATES_OPT] +
1578 
    INSTANCE_POLICY_OPTS,
1583 
     DISK_STATE_OPT, SUBMIT_OPT, ENABLED_DISK_TEMPLATES_OPT,
1584 
     IPOLICY_STD_SPECS_OPT] + INSTANCE_POLICY_OPTS,
1579 1585 
    "[opts...]",
1580 1586 
    "Alters the parameters of the cluster"),
1581 1587 
  "renew-crypto": (

Also available in: Unified diff