Revision 5af3da74
b/lib/cmdlib.py | ||
---|---|---|
1486 | 1486 |
(node, vgstatus)) |
1487 | 1487 |
|
1488 | 1488 |
self.cluster = cluster = self.cfg.GetClusterInfo() |
1489 |
# validate beparams changes
|
|
1489 |
# validate params changes |
|
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 | 1493 |
cluster.beparams[constants.PP_DEFAULT], self.op.beparams) |
1494 | 1494 |
|
1495 |
if self.op.nicparams: |
|
1496 |
utils.ForceDictType(self.op.nicparams, constants.NICS_PARAMETER_TYPES) |
|
1497 |
self.new_nicparams = objects.FillDict( |
|
1498 |
cluster.nicparams[constants.PP_DEFAULT], self.op.nicparams) |
|
1499 |
objects.NIC.CheckParameterSyntax(self.new_nicparams) |
|
1500 |
|
|
1495 | 1501 |
# hypervisor list/parameters |
1496 | 1502 |
self.new_hvparams = objects.FillDict(cluster.hvparams, {}) |
1497 | 1503 |
if self.op.hvparams: |
... | ... | |
1539 | 1545 |
self.cluster.enabled_hypervisors = self.op.enabled_hypervisors |
1540 | 1546 |
if self.op.beparams: |
1541 | 1547 |
self.cluster.beparams[constants.PP_DEFAULT] = self.new_beparams |
1548 |
if self.op.nicparams: |
|
1549 |
self.cluster.nicparams[constants.PP_DEFAULT] = self.new_nicparams |
|
1550 |
|
|
1542 | 1551 |
if self.op.candidate_pool_size is not None: |
1543 | 1552 |
self.cluster.candidate_pool_size = self.op.candidate_pool_size |
1544 | 1553 |
|
b/lib/opcodes.py | ||
---|---|---|
262 | 262 |
"enabled_hypervisors", |
263 | 263 |
"hvparams", |
264 | 264 |
"beparams", |
265 |
"nicparams", |
|
265 | 266 |
"candidate_pool_size", |
266 | 267 |
] |
267 | 268 |
|
b/scripts/gnt-cluster | ||
---|---|---|
457 | 457 |
""" |
458 | 458 |
if not (not opts.lvm_storage or opts.vg_name or |
459 | 459 |
opts.enabled_hypervisors or opts.hvparams or |
460 |
opts.beparams or opts.candidate_pool_size is not None): |
|
460 |
opts.beparams or opts.nicparams or |
|
461 |
opts.candidate_pool_size is not None): |
|
461 | 462 |
ToStderr("Please give at least one of the parameters.") |
462 | 463 |
return 1 |
463 | 464 |
|
... | ... | |
480 | 481 |
beparams = opts.beparams |
481 | 482 |
utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) |
482 | 483 |
|
484 |
nicparams = opts.nicparams |
|
485 |
utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) |
|
486 |
|
|
483 | 487 |
op = opcodes.OpSetClusterParams(vg_name=vg_name, |
484 | 488 |
enabled_hypervisors=hvlist, |
485 | 489 |
hvparams=hvparams, |
486 | 490 |
beparams=beparams, |
491 |
nicparams=nicparams, |
|
487 | 492 |
candidate_pool_size=opts.candidate_pool_size) |
488 | 493 |
SubmitOpCode(op) |
489 | 494 |
return 0 |
... | ... | |
667 | 672 |
keyval_option("-B", "--backend-parameters", dest="beparams", |
668 | 673 |
type="keyval", default={}, |
669 | 674 |
help="Backend parameters"), |
675 |
keyval_option("-N", "--nic-parameters", dest="nicparams", |
|
676 |
type="keyval", default={}, |
|
677 |
help="NIC parameters"), |
|
670 | 678 |
make_option("-C", "--candidate-pool-size", default=None, |
671 | 679 |
help="Set the candidate pool size", |
672 | 680 |
dest="candidate_pool_size", type="int"), |
Also available in: Unified diff