Revision 4ef7f423 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1490 | 1490 |
if self.op.beparams: |
| 1491 | 1491 |
utils.ForceDictType(self.op.beparams, constants.BES_PARAMETER_TYPES) |
| 1492 | 1492 |
self.new_beparams = objects.FillDict( |
| 1493 |
cluster.beparams[constants.BEGR_DEFAULT], self.op.beparams)
|
|
| 1493 |
cluster.beparams[constants.PP_DEFAULT], self.op.beparams)
|
|
| 1494 | 1494 |
|
| 1495 | 1495 |
# hypervisor list/parameters |
| 1496 | 1496 |
self.new_hvparams = objects.FillDict(cluster.hvparams, {})
|
| ... | ... | |
| 1538 | 1538 |
if self.op.enabled_hypervisors is not None: |
| 1539 | 1539 |
self.cluster.enabled_hypervisors = self.op.enabled_hypervisors |
| 1540 | 1540 |
if self.op.beparams: |
| 1541 |
self.cluster.beparams[constants.BEGR_DEFAULT] = self.new_beparams
|
|
| 1541 |
self.cluster.beparams[constants.PP_DEFAULT] = self.new_beparams
|
|
| 1542 | 1542 |
if self.op.candidate_pool_size is not None: |
| 1543 | 1543 |
self.cluster.candidate_pool_size = self.op.candidate_pool_size |
| 1544 | 1544 |
|
| ... | ... | |
| 4411 | 4411 |
|
| 4412 | 4412 |
# fill and remember the beparams dict |
| 4413 | 4413 |
utils.ForceDictType(self.op.beparams, constants.BES_PARAMETER_TYPES) |
| 4414 |
self.be_full = objects.FillDict(cluster.beparams[constants.BEGR_DEFAULT],
|
|
| 4414 |
self.be_full = objects.FillDict(cluster.beparams[constants.PP_DEFAULT],
|
|
| 4415 | 4415 |
self.op.beparams) |
| 4416 | 4416 |
|
| 4417 | 4417 |
#### instance parameters check |
| ... | ... | |
| 5987 | 5987 |
i_bedict[key] = val |
| 5988 | 5988 |
cluster = self.cfg.GetClusterInfo() |
| 5989 | 5989 |
utils.ForceDictType(i_bedict, constants.BES_PARAMETER_TYPES) |
| 5990 |
be_new = objects.FillDict(cluster.beparams[constants.BEGR_DEFAULT],
|
|
| 5990 |
be_new = objects.FillDict(cluster.beparams[constants.PP_DEFAULT],
|
|
| 5991 | 5991 |
i_bedict) |
| 5992 | 5992 |
self.be_new = be_new # the new actual values |
| 5993 | 5993 |
self.be_inst = i_bedict # the new dict (without defaults) |
Also available in: Unified diff