Revision 3e8a6f39
| 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) |
|
| 111 | 113 |
utils.AddNodeToCandidateCerts("%s-SERVER" % master_uuid,
|
| 112 | 114 |
server_digest, |
| 113 | 115 |
cluster.candidate_certs) |
| 116 |
utils.AddNodeToCandidateCerts("%s-OLDMASTER" % master_uuid,
|
|
| 117 |
old_master_digest, |
|
| 118 |
cluster.candidate_certs) |
|
| 114 | 119 |
new_master_digest = _UpdateMasterClientCert(self, master_uuid, cluster, |
| 115 | 120 |
feedback_fn) |
| 116 | 121 |
|
| 117 |
cluster.candidate_certs = {master_uuid: new_master_digest}
|
|
| 122 |
utils.AddNodeToCandidateCerts(master_uuid, |
|
| 123 |
new_master_digest, |
|
| 124 |
cluster.candidate_certs) |
|
| 118 | 125 |
nodes = self.cfg.GetAllNodesInfo() |
| 119 | 126 |
for (node_uuid, node_info) in nodes.items(): |
| 120 | 127 |
if node_uuid != master_uuid: |
| 121 | 128 |
new_digest = CreateNewClientCert(self, node_uuid) |
| 122 | 129 |
if node_info.master_candidate: |
| 123 |
cluster.candidate_certs[node_uuid] = new_digest |
|
| 130 |
utils.AddNodeToCandidateCerts(node_uuid, |
|
| 131 |
new_digest, |
|
| 132 |
cluster.candidate_certs) |
|
| 133 |
utils.RemoveNodeFromCandidateCerts("%s-SERVER" % master_uuid,
|
|
| 134 |
cluster.candidate_certs) |
|
| 135 |
utils.RemoveNodeFromCandidateCerts("%s-OLDMASTER" % master_uuid,
|
|
| 136 |
cluster.candidate_certs) |
|
| 124 | 137 |
# Trigger another update of the config now with the new master cert |
| 125 | 138 |
self.cfg.Update(cluster, feedback_fn) |
| 126 | 139 |
|
Also available in: Unified diff