Revision 168c1de2 lib/bootstrap.py

b/lib/bootstrap.py
125 125
  @param rapi_cert_pem: New RAPI certificate in PEM format
126 126

  
127 127
  """
128
  # SSL certificate
129
  cluster_cert_exists = os.path.exists(constants.SSL_CERT_FILE)
128
  # noded SSL certificate
129
  cluster_cert_exists = os.path.exists(constants.NODED_CERT_FILE)
130 130
  if new_cluster_cert or not cluster_cert_exists:
131 131
    if cluster_cert_exists:
132
      utils.CreateBackup(constants.SSL_CERT_FILE)
132
      utils.CreateBackup(constants.NODED_CERT_FILE)
133 133

  
134 134
    logging.debug("Generating new cluster certificate at %s",
135
                  constants.SSL_CERT_FILE)
136
    GenerateSelfSignedSslCert(constants.SSL_CERT_FILE)
135
                  constants.NODED_CERT_FILE)
136
    GenerateSelfSignedSslCert(constants.NODED_CERT_FILE)
137 137

  
138 138
  # HMAC key
139 139
  if new_hmac_key or not os.path.exists(constants.HMAC_CLUSTER_KEY):
......
426 426
  """
427 427
  sshrunner = ssh.SshRunner(cluster_name)
428 428

  
429
  noded_cert = utils.ReadFile(constants.SSL_CERT_FILE)
429
  noded_cert = utils.ReadFile(constants.NODED_CERT_FILE)
430 430
  rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE)
431 431
  hmac_key = utils.ReadFile(constants.HMAC_CLUSTER_KEY)
432 432

  
......
459 459
               "%s!EOF.\n"
460 460
               "chmod 0400 %s %s %s && "
461 461
               "%s start %s" %
462
               (constants.SSL_CERT_FILE, noded_cert,
462
               (constants.NODED_CERT_FILE, noded_cert,
463 463
                constants.RAPI_CERT_FILE, rapi_cert,
464 464
                constants.HMAC_CLUSTER_KEY, hmac_key,
465
                constants.SSL_CERT_FILE, constants.RAPI_CERT_FILE,
465
                constants.NODED_CERT_FILE, constants.RAPI_CERT_FILE,
466 466
                constants.HMAC_CLUSTER_KEY,
467 467
                constants.DAEMON_UTIL, constants.NODED))
468 468

  

Also available in: Unified diff