This patch removes the code for renewing the master nodes' client certificate using SSL. This is no longer needed, as the master nodes' certificate is created in gnt_cluster.py already.
Signed-off-by: Helga Velroyen <[email protected]> --- lib/cmdlib/cluster.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py index c19890a..e19b08e 100644 --- a/lib/cmdlib/cluster.py +++ b/lib/cmdlib/cluster.py @@ -72,36 +72,6 @@ from ganeti.cmdlib.common import ShareAll, RunPostHook, \ import ganeti.masterd.instance -def _UpdateMasterClientCert( - lu, cfg, master_uuid, - client_cert=pathutils.NODED_CLIENT_CERT_FILE, - client_cert_tmp=pathutils.NODED_CLIENT_CERT_FILE_TMP): - """Renews the master's client certificate and propagates the config. - - @type lu: C{LogicalUnit} - @param lu: the logical unit holding the config - @type cfg: C{config.ConfigWriter} - @param cfg: the cluster's configuration - @type master_uuid: string - @param master_uuid: the master node's UUID - @type client_cert: string - @param client_cert: the path of the client certificate - @type client_cert_tmp: string - @param client_cert_tmp: the temporary path of the client certificate - @rtype: string - @return: the digest of the newly created client certificate - - """ - client_digest = GetClientCertDigest(lu, master_uuid, filename=client_cert_tmp) - cfg.AddNodeToCandidateCerts(master_uuid, client_digest) - # This triggers an update of the config and distribution of it with the old - # SSL certificate - - utils.RemoveFile(client_cert) - utils.RenameFile(client_cert_tmp, client_cert) - return client_digest - - class LUClusterRenewCrypto(NoHooksLU): """Renew the cluster's crypto tokens. -- 2.4.3.573.g4eafbef
