Revision 8b057218 lib/config.py
| b/lib/config.py | ||
|---|---|---|
| 480 | 480 |
except errors.ConfigurationError, err: |
| 481 | 481 |
result.append("%s has invalid nicparams: %s" % (owner, err))
|
| 482 | 482 |
|
| 483 |
def _helper_ipolicy(owner, params): |
|
| 483 |
def _helper_ipolicy(owner, params, check_std):
|
|
| 484 | 484 |
try: |
| 485 |
objects.InstancePolicy.CheckParameterSyntax(params) |
|
| 485 |
objects.InstancePolicy.CheckParameterSyntax(params, check_std)
|
|
| 486 | 486 |
except errors.ConfigurationError, err: |
| 487 | 487 |
result.append("%s has invalid instance policy: %s" % (owner, err))
|
| 488 | 488 |
|
| ... | ... | |
| 510 | 510 |
_helper_nic("cluster", cluster.SimpleFillNIC({}))
|
| 511 | 511 |
_helper("cluster", "ndparams", cluster.SimpleFillND({}),
|
| 512 | 512 |
constants.NDS_PARAMETER_TYPES) |
| 513 |
_helper_ipolicy("cluster", cluster.SimpleFillIPolicy({}))
|
|
| 513 |
_helper_ipolicy("cluster", cluster.SimpleFillIPolicy({}), True)
|
|
| 514 | 514 |
_helper_ispecs("cluster", cluster.SimpleFillIPolicy({}))
|
| 515 | 515 |
|
| 516 | 516 |
# per-instance checks |
| ... | ... | |
| 636 | 636 |
else: |
| 637 | 637 |
nodegroups_names.add(nodegroup.name) |
| 638 | 638 |
group_name = "group %s" % nodegroup.name |
| 639 |
_helper_ipolicy(group_name, cluster.SimpleFillIPolicy(nodegroup.ipolicy)) |
|
| 639 |
_helper_ipolicy(group_name, cluster.SimpleFillIPolicy(nodegroup.ipolicy), |
|
| 640 |
False) |
|
| 640 | 641 |
_helper_ispecs(group_name, cluster.SimpleFillIPolicy(nodegroup.ipolicy)) |
| 641 | 642 |
if nodegroup.ndparams: |
| 642 | 643 |
_helper(group_name, "ndparams", |
Also available in: Unified diff