commit 6813baff7f8460170eea84e363584f643c36a6ac
Merge: 38692c5 011924b
Author: Klaus Aehlig <[email protected]>
Date: Thu Mar 5 15:06:04 2015 +0100
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
Skip offline nodes in RENEW_CRYPTO jobs
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/cmdlib/cluster.py
index d65a7b2,24972fa..193f306
--- a/lib/cmdlib/cluster.py
+++ b/lib/cmdlib/cluster.py
@@@ -125,11 -129,17 +125,14 @@@ class LUClusterRenewCrypto(NoHooksLU)
except IOError:
logging.info("No old certificate available.")
- new_master_digest = _UpdateMasterClientCert(self, master_uuid, cluster,
- feedback_fn)
+ new_master_digest = _UpdateMasterClientCert(self, self.cfg, master_uuid)
- utils.AddNodeToCandidateCerts(master_uuid,
- new_master_digest,
- cluster.candidate_certs)
+ self.cfg.AddNodeToCandidateCerts(master_uuid, new_master_digest)
nodes = self.cfg.GetAllNodesInfo()
for (node_uuid, node_info) in nodes.items():
+ if node_info.offline:
+ feedback_fn("* Skipping offline node %s" % node_info.name)
+ continue
if node_uuid != master_uuid:
new_digest = CreateNewClientCert(self, node_uuid)
if node_info.master_candidate:
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
