Revision da27bc7d lib/cmdlib/cluster.py

b/lib/cmdlib/cluster.py
108 108

  
109 109
    server_digest = utils.GetCertificateDigest(
110 110
      cert_filename=pathutils.NODED_CERT_FILE)
111
    old_master_digest = utils.GetCertificateDigest(
112
      cert_filename=pathutils.NODED_CLIENT_CERT_FILE)
113 111
    utils.AddNodeToCandidateCerts("%s-SERVER" % master_uuid,
114 112
                                  server_digest,
115 113
                                  cluster.candidate_certs)
116
    utils.AddNodeToCandidateCerts("%s-OLDMASTER" % master_uuid,
117
                                  old_master_digest,
118
                                  cluster.candidate_certs)
114
    try:
115
      old_master_digest = utils.GetCertificateDigest(
116
        cert_filename=pathutils.NODED_CLIENT_CERT_FILE)
117
      utils.AddNodeToCandidateCerts("%s-OLDMASTER" % master_uuid,
118
                                    old_master_digest,
119
                                    cluster.candidate_certs)
120
    except IOError:
121
      logging.info("No old certificate available.")
122

  
119 123
    new_master_digest = _UpdateMasterClientCert(self, master_uuid, cluster,
120 124
                                                feedback_fn)
121 125

  

Also available in: Unified diff