From 6bbbc2555c552bd723db2de65585c17b8e02b23b Mon Sep 17 00:00:00 2001 From: Helga Velroyen Date: Wed, 27 May 2015 14:49:16 +0200 Subject: [PATCH] Fix bug in ssconf comparison, disable it for vcluster This patch fixes a bug in the comparison of the 'ssconf_master_candidate_certs' and disables the test for vcluster. Signed-off-by: Helga Velroyen Reviewed-by: Hrvoje Ribicic --- qa/qa_cluster.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py index 4aad0a5cf..3d8b61cf3 100644 --- a/qa/qa_cluster.py +++ b/qa/qa_cluster.py @@ -1157,13 +1157,17 @@ def _AssertSsconfCertFiles(master): @param master: name of the master node """ + (vcluster_master, _) = qa_config.GetVclusterSettings() + if vcluster_master: + print "Skipping asserting SsconfCertFiles for Vcluster" + return nodes = qa_config.get("nodes") ssconf_file = "/var/lib/ganeti/ssconf_master_candidates_certs" ssconf_content = {} for node in nodes: cmd = ["cat", ssconf_file] print "Ssconf Master Certificates of node '%s'." % node.primary - result_output = GetCommandOutput(master.primary, utils.ShellQuoteArgs(cmd)) + result_output = GetCommandOutput(node.primary, utils.ShellQuoteArgs(cmd)) ssconf_content[node] = result_output # Clean up result to make it comparable: -- GitLab