From 7506a7f1e0a33f6ae7047080cad21a3e43e3a440 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Fri, 12 Mar 2010 11:49:16 +0100 Subject: [PATCH] cfgupgrade: Use new bootstrap function for certs and keys Signed-off-by: Michael Hanselmann Reviewed-by: Iustin Pop --- tools/cfgupgrade | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/cfgupgrade b/tools/cfgupgrade index e7be591..5ecc098 100755 --- a/tools/cfgupgrade +++ b/tools/cfgupgrade @@ -174,13 +174,7 @@ def main(): backup=True) if not options.dry_run: - if not os.path.exists(options.RAPI_CERT_FILE): - logging.debug("Writing RAPI certificate to %s", options.RAPI_CERT_FILE) - bootstrap.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE) - - if not os.path.exists(options.HMAC_CLUSTER_KEY): - logging.debug("Writing HMAC key to %s", options.HMAC_CLUSTER_KEY) - bootstrap.GenerateHmacKey(options.HMAC_CLUSTER_KEY) + bootstrap.GenerateClusterCrypto(False, False, False) except: logging.critical("Writing configuration failed. It is probably in an" -- 1.7.10.4