Commit 47848c22 authored by Klaus Aehlig's avatar Klaus Aehlig

Remove now unused variable

Avoiding lint errors on the onehand, and code complexity
on the other.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parent 6bbbc255
...@@ -1150,12 +1150,9 @@ def TestClusterVersion(): ...@@ -1150,12 +1150,9 @@ def TestClusterVersion():
AssertCommand(["gnt-cluster", "version"]) AssertCommand(["gnt-cluster", "version"])
def _AssertSsconfCertFiles(master): def _AssertSsconfCertFiles():
"""This asserts that all ssconf_master_candidate_certs have the same content. """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() (vcluster_master, _) = qa_config.GetVclusterSettings()
if vcluster_master: if vcluster_master:
...@@ -1240,25 +1237,25 @@ def TestClusterRenewCrypto(): ...@@ -1240,25 +1237,25 @@ def TestClusterRenewCrypto():
"--new-cluster-certificate", "--new-confd-hmac-key", "--new-cluster-certificate", "--new-confd-hmac-key",
"--new-rapi-certificate", "--new-cluster-domain-secret", "--new-rapi-certificate", "--new-cluster-domain-secret",
"--new-node-certificates"]) "--new-node-certificates"])
_AssertSsconfCertFiles(master) _AssertSsconfCertFiles()
AssertCommand(["gnt-cluster", "verify"]) AssertCommand(["gnt-cluster", "verify"])
# Only renew node certificates # Only renew node certificates
AssertCommand(["gnt-cluster", "renew-crypto", "--force", AssertCommand(["gnt-cluster", "renew-crypto", "--force",
"--new-node-certificates"]) "--new-node-certificates"])
_AssertSsconfCertFiles(master) _AssertSsconfCertFiles()
AssertCommand(["gnt-cluster", "verify"]) AssertCommand(["gnt-cluster", "verify"])
# Only renew cluster certificate # Only renew cluster certificate
AssertCommand(["gnt-cluster", "renew-crypto", "--force", AssertCommand(["gnt-cluster", "renew-crypto", "--force",
"--new-cluster-certificate"]) "--new-cluster-certificate"])
_AssertSsconfCertFiles(master) _AssertSsconfCertFiles()
AssertCommand(["gnt-cluster", "verify"]) AssertCommand(["gnt-cluster", "verify"])
# Restore RAPI certificate # Restore RAPI certificate
AssertCommand(["gnt-cluster", "renew-crypto", "--force", AssertCommand(["gnt-cluster", "renew-crypto", "--force",
"--rapi-certificate=%s" % rapi_cert_backup]) "--rapi-certificate=%s" % rapi_cert_backup])
_AssertSsconfCertFiles(master) _AssertSsconfCertFiles()
AssertCommand(["gnt-cluster", "verify"]) AssertCommand(["gnt-cluster", "verify"])
finally: finally:
AssertCommand(["rm", "-f", rapi_cert_backup]) AssertCommand(["rm", "-f", rapi_cert_backup])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment