diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 88ef489d43cdc02a120f198c00fb90b010235b31..a8135fd1cd72d8d5431cace556b54610cc74509d 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -796,7 +796,8 @@ class LUVerifyCluster(NoHooksLU): """ bad = False feedback_fn("* Verifying global settings") - self.cfg.VerifyConfig() + for msg in self.cfg.VerifyConfig(): + feedback_fn(" - ERROR: %s" % msg) vg_name = self.cfg.GetVGName() nodelist = utils.NiceSort(self.cfg.GetNodeList()) diff --git a/lib/config.py b/lib/config.py index 50fc784dc7f016b1692c9188fad86b58677e8892..fcf8b9fa06cc2a8d8b162dd2a7cf78d96f6402ea 100644 --- a/lib/config.py +++ b/lib/config.py @@ -168,15 +168,15 @@ class ConfigWriter: for instance_name in data.instances: instance = data.instances[instance_name] if instance.primary_node not in data.nodes: - result.append("Instance '%s' has invalid primary node '%s'" % + result.append("instance '%s' has invalid primary node '%s'" % (instance_name, instance.primary_node)) for snode in instance.secondary_nodes: if snode not in data.nodes: - result.append("Instance '%s' has invalid secondary node '%s'" % + result.append("instance '%s' has invalid secondary node '%s'" % (instance_name, snode)) for idx, nic in enumerate(instance.nics): if nic.mac in seen_macs: - result.append("Instance '%s' has NIC %d mac %s duplicate" % + result.append("instance '%s' has NIC %d mac %s duplicate" % (instance_name, idx, nic.mac)) else: seen_macs.append(nic.mac)