Revision 976b78ba lib/client/gnt_cluster.py
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 143 | 143 |
utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES) |
| 144 | 144 |
|
| 145 | 145 |
# prepare ipolicy dict |
| 146 |
ispecs_dts = opts.ipolicy_disk_templates # hate long var names
|
|
| 147 |
ipolicy_raw = \
|
|
| 148 |
objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
|
|
| 149 |
ispecs_cpu_count=opts.ispecs_cpu_count,
|
|
| 150 |
ispecs_disk_count=opts.ispecs_disk_count,
|
|
| 151 |
ispecs_disk_size=opts.ispecs_disk_size,
|
|
| 152 |
ispecs_nic_count=opts.ispecs_nic_count,
|
|
| 153 |
ipolicy_disk_templates=ispecs_dts,
|
|
| 154 |
fill_all=True)
|
|
| 146 |
ipolicy_raw = objects.CreateIPolicyFromOpts(
|
|
| 147 |
ispecs_mem_size=opts.ispecs_mem_size,
|
|
| 148 |
ispecs_cpu_count=opts.ispecs_cpu_count,
|
|
| 149 |
ispecs_disk_count=opts.ispecs_disk_count,
|
|
| 150 |
ispecs_disk_size=opts.ispecs_disk_size,
|
|
| 151 |
ispecs_nic_count=opts.ispecs_nic_count,
|
|
| 152 |
ipolicy_disk_templates=opts.ipolicy_disk_templates,
|
|
| 153 |
ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio,
|
|
| 154 |
fill_all=True) |
|
| 155 | 155 |
ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw) |
| 156 | 156 |
|
| 157 | 157 |
if opts.candidate_pool_size is None: |
| ... | ... | |
| 997 | 997 |
if ndparams is not None: |
| 998 | 998 |
utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) |
| 999 | 999 |
|
| 1000 |
ispecs_dts = opts.ipolicy_disk_templates |
|
| 1001 |
ipolicy = \ |
|
| 1002 |
objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size, |
|
| 1003 |
ispecs_cpu_count=opts.ispecs_cpu_count, |
|
| 1004 |
ispecs_disk_count=opts.ispecs_disk_count, |
|
| 1005 |
ispecs_disk_size=opts.ispecs_disk_size, |
|
| 1006 |
ispecs_nic_count=opts.ispecs_nic_count, |
|
| 1007 |
ipolicy_disk_templates=ispecs_dts) |
|
| 1000 |
ipolicy = objects.CreateIPolicyFromOpts( |
|
| 1001 |
ispecs_mem_size=opts.ispecs_mem_size, |
|
| 1002 |
ispecs_cpu_count=opts.ispecs_cpu_count, |
|
| 1003 |
ispecs_disk_count=opts.ispecs_disk_count, |
|
| 1004 |
ispecs_disk_size=opts.ispecs_disk_size, |
|
| 1005 |
ispecs_nic_count=opts.ispecs_nic_count, |
|
| 1006 |
ipolicy_disk_templates=opts.ipolicy_disk_templates, |
|
| 1007 |
ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio, |
|
| 1008 |
) |
|
| 1008 | 1009 |
|
| 1009 | 1010 |
mnh = opts.maintain_node_health |
| 1010 | 1011 |
|
Also available in: Unified diff