Revision 66af5ec5 lib/client/gnt_cluster.py
b/lib/client/gnt_cluster.py | ||
---|---|---|
193 | 193 |
|
194 | 194 |
hv_state = dict(opts.hv_state) |
195 | 195 |
|
196 |
# FIXME: remove enabled_storage_types when enabled_disk_templates are |
|
197 |
# fully implemented. |
|
198 |
enabled_storage_types = opts.enabled_storage_types |
|
199 |
if enabled_storage_types is not None: |
|
200 |
enabled_storage_types = enabled_storage_types.split(",") |
|
201 |
else: |
|
202 |
enabled_storage_types = list(constants.DEFAULT_ENABLED_STORAGE_TYPES) |
|
203 |
|
|
204 | 196 |
enabled_disk_templates = opts.enabled_disk_templates |
205 | 197 |
if enabled_disk_templates: |
206 | 198 |
enabled_disk_templates = enabled_disk_templates.split(",") |
... | ... | |
972 | 964 |
opts.use_external_mip_script is not None or |
973 | 965 |
opts.prealloc_wipe_disks is not None or |
974 | 966 |
opts.hv_state or |
967 |
# FIXME: Remove 'enabled_storage_types' once 'enabled_disk_templates' |
|
968 |
# are fully implemented. |
|
975 | 969 |
opts.enabled_storage_types or |
970 |
opts.enabled_disk_templates or |
|
976 | 971 |
opts.disk_state or |
977 | 972 |
opts.ispecs_mem_size or |
978 | 973 |
opts.ispecs_cpu_count or |
... | ... | |
1005 | 1000 |
if hvlist is not None: |
1006 | 1001 |
hvlist = hvlist.split(",") |
1007 | 1002 |
|
1003 |
# FIXME: Remove once 'enabled_disk_templates' are fully implemented. |
|
1008 | 1004 |
enabled_storage_types = opts.enabled_storage_types |
1009 | 1005 |
if enabled_storage_types is not None: |
1010 | 1006 |
enabled_storage_types = enabled_storage_types.split(",") |
1011 | 1007 |
|
1008 |
enabled_disk_templates = opts.enabled_disk_templates |
|
1009 |
if enabled_disk_templates: |
|
1010 |
enabled_disk_templates = enabled_disk_templates.split(",") |
|
1011 |
|
|
1012 | 1012 |
# a list of (name, dict) we can pass directly to dict() (or []) |
1013 | 1013 |
hvparams = dict(opts.hvparams) |
1014 | 1014 |
for hv_params in hvparams.values(): |
... | ... | |
1100 | 1100 |
use_external_mip_script=ext_ip_script, |
1101 | 1101 |
hv_state=hv_state, |
1102 | 1102 |
disk_state=disk_state, |
1103 |
# FIXME: remove once 'enabled_disk_templates' are fully implemented. |
|
1103 | 1104 |
enabled_storage_types=enabled_storage_types, |
1105 |
enabled_disk_templates=enabled_disk_templates, |
|
1104 | 1106 |
) |
1105 | 1107 |
SubmitOrSend(op, opts) |
1106 | 1108 |
return 0 |
... | ... | |
1584 | 1586 |
DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, |
1585 | 1587 |
RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, |
1586 | 1588 |
NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT, |
1587 |
DISK_STATE_OPT, SUBMIT_OPT, ENABLED_STORAGE_TYPES_OPT] + |
|
1589 |
DISK_STATE_OPT, SUBMIT_OPT, ENABLED_STORAGE_TYPES_OPT, |
|
1590 |
ENABLED_DISK_TEMPLATES_OPT] + |
|
1588 | 1591 |
INSTANCE_POLICY_OPTS, |
1589 | 1592 |
"[opts...]", |
1590 | 1593 |
"Alters the parameters of the cluster"), |
Also available in: Unified diff