From 47848c229ef48884fbb62e581c024bbf0f5110aa Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Wed, 27 May 2015 18:31:16 +0200 Subject: [PATCH] Remove now unused variable Avoiding lint errors on the onehand, and code complexity on the other. Signed-off-by: Klaus Aehlig Reviewed-by: Hrvoje Ribicic --- qa/qa_cluster.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py index 3d8b61cf3..138b5f9a2 100644 --- a/qa/qa_cluster.py +++ b/qa/qa_cluster.py @@ -1150,12 +1150,9 @@ def TestClusterVersion(): AssertCommand(["gnt-cluster", "version"]) -def _AssertSsconfCertFiles(master): +def _AssertSsconfCertFiles(): """This asserts that all ssconf_master_candidate_certs have the same content. - @type master: string - @param master: name of the master node - """ (vcluster_master, _) = qa_config.GetVclusterSettings() if vcluster_master: @@ -1240,25 +1237,25 @@ def TestClusterRenewCrypto(): "--new-cluster-certificate", "--new-confd-hmac-key", "--new-rapi-certificate", "--new-cluster-domain-secret", "--new-node-certificates"]) - _AssertSsconfCertFiles(master) + _AssertSsconfCertFiles() AssertCommand(["gnt-cluster", "verify"]) # Only renew node certificates AssertCommand(["gnt-cluster", "renew-crypto", "--force", "--new-node-certificates"]) - _AssertSsconfCertFiles(master) + _AssertSsconfCertFiles() AssertCommand(["gnt-cluster", "verify"]) # Only renew cluster certificate AssertCommand(["gnt-cluster", "renew-crypto", "--force", "--new-cluster-certificate"]) - _AssertSsconfCertFiles(master) + _AssertSsconfCertFiles() AssertCommand(["gnt-cluster", "verify"]) # Restore RAPI certificate AssertCommand(["gnt-cluster", "renew-crypto", "--force", "--rapi-certificate=%s" % rapi_cert_backup]) - _AssertSsconfCertFiles(master) + _AssertSsconfCertFiles() AssertCommand(["gnt-cluster", "verify"]) finally: AssertCommand(["rm", "-f", rapi_cert_backup]) -- GitLab