Remove now unused variable
authorKlaus Aehlig <aehlig@google.com>
Wed, 27 May 2015 16:31:16 +0000 (18:31 +0200)
committerKlaus Aehlig <aehlig@google.com>
Wed, 27 May 2015 16:58:15 +0000 (16:58 +0000)
Avoiding lint errors on the onehand, and code complexity
on the other.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

qa/qa_cluster.py

index 3d8b61c..138b5f9 100644 (file)
@@ -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])