Revision 2cc673a3 lib/client/gnt_cluster.py
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 139 | 139 |
utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES) |
| 140 | 140 |
|
| 141 | 141 |
# prepare ipolicy dict |
| 142 |
ispecs_dts = opts.ispecs_disk_templates # hate long var names |
|
| 142 | 143 |
ipolicy_raw = \ |
| 143 | 144 |
objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size, |
| 144 | 145 |
ispecs_cpu_count=opts.ispecs_cpu_count, |
| 145 | 146 |
ispecs_disk_count=opts.ispecs_disk_count, |
| 146 | 147 |
ispecs_disk_size=opts.ispecs_disk_size, |
| 147 |
ispecs_nic_count=opts.ispecs_nic_count) |
|
| 148 |
ipolicy = objects.FillDictOfDicts(constants.IPOLICY_DEFAULTS, ipolicy_raw) |
|
| 148 |
ispecs_nic_count=opts.ispecs_nic_count, |
|
| 149 |
ispecs_disk_templates=ispecs_dts, |
|
| 150 |
fill_all=True) |
|
| 151 |
ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw) |
|
| 149 | 152 |
for value in ipolicy.values(): |
| 150 | 153 |
utils.ForceDictType(value, constants.ISPECS_PARAMETER_TYPES) |
| 151 | 154 |
|
| ... | ... | |
| 461 | 464 |
for key in constants.IPOLICY_PARAMETERS: |
| 462 | 465 |
ToStdout(" - %s", key)
|
| 463 | 466 |
_PrintGroupedParams(result["ipolicy"][key], roman=opts.roman_integers) |
| 467 |
ToStdout(" - enabled disk templates: %s",
|
|
| 468 |
utils.CommaJoin(result["ipolicy"][constants.ISPECS_DTS])) |
|
| 464 | 469 |
|
| 465 | 470 |
return 0 |
| 466 | 471 |
|
| ... | ... | |
| 984 | 989 |
if ndparams is not None: |
| 985 | 990 |
utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) |
| 986 | 991 |
|
| 992 |
ispecs_dts = opts.ispecs_disk_templates |
|
| 987 | 993 |
ipolicy = \ |
| 988 | 994 |
objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size, |
| 989 | 995 |
ispecs_cpu_count=opts.ispecs_cpu_count, |
| 990 | 996 |
ispecs_disk_count=opts.ispecs_disk_count, |
| 991 | 997 |
ispecs_disk_size=opts.ispecs_disk_size, |
| 992 |
ispecs_nic_count=opts.ispecs_nic_count) |
|
| 998 |
ispecs_nic_count=opts.ispecs_nic_count, |
|
| 999 |
ispecs_disk_templates=ispecs_dts) |
|
| 993 | 1000 |
|
| 994 | 1001 |
mnh = opts.maintain_node_health |
| 995 | 1002 |
|
Also available in: Unified diff