Revision eeaa5f6c lib/client/gnt_cluster.py
b/lib/client/gnt_cluster.py | ||
---|---|---|
1 | 1 |
# |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2006, 2007, 2010, 2011, 2012 Google Inc. |
|
4 |
# Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
144 | 144 |
utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES) |
145 | 145 |
|
146 | 146 |
# prepare ipolicy dict |
147 |
ipolicy_raw = CreateIPolicyFromOpts(
|
|
147 |
ipolicy = CreateIPolicyFromOpts( |
|
148 | 148 |
ispecs_mem_size=opts.ispecs_mem_size, |
149 | 149 |
ispecs_cpu_count=opts.ispecs_cpu_count, |
150 | 150 |
ispecs_disk_count=opts.ispecs_disk_count, |
... | ... | |
154 | 154 |
ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio, |
155 | 155 |
ipolicy_spindle_ratio=opts.ipolicy_spindle_ratio, |
156 | 156 |
fill_all=True) |
157 |
ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw) |
|
158 | 157 |
|
159 | 158 |
if opts.candidate_pool_size is None: |
160 | 159 |
opts.candidate_pool_size = constants.MASTER_POOL_SIZE_DEFAULT |
Also available in: Unified diff