Ignore this patch please, it was accidentally sent out. Thx!
On Wed, Feb 19, 2014 at 5:46 PM, Helga Velroyen <[email protected]> wrote: > Signed-off-by: Helga Velroyen <[email protected]> > --- > lib/cmdlib/cluster.py | 6 +++++- > qa/qa_cluster.py | 4 ++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py > index 513e5ce..ab0c686 100644 > --- a/lib/cmdlib/cluster.py > +++ b/lib/cmdlib/cluster.py > @@ -126,8 +126,12 @@ class LUClusterRenewCrypto(NoHooksLU): > for (node_uuid, node_info) in nodes.items(): > if node_uuid != master_uuid: > new_digest = CreateNewClientCert(self, node_uuid) > + logging.error("XXX node info %s" % node_info) > + logging.error("XXX node info master candidate %s" % > node_info.master_candidate) > if node_info.master_candidate: > - cluster.candidate_certs[node_uuid] = new_digest > + utils.AddNodeToCandidateCerts(node_uuid, > + new_digest, > + cluster.candidate_certs) > cluster.candidate_certs = {master_uuid: new_master_digest} > # Trigger another update of the config now with the new master cert > self.cfg.Update(cluster, feedback_fn) > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index 1fefe96..db68a19 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -1074,8 +1074,8 @@ def TestClusterRenewCrypto(): > # Normal case > AssertCommand(["gnt-cluster", "renew-crypto", "--force", > "--new-cluster-certificate", "--new-confd-hmac-key", > - "--new-rapi-certificate", > "--new-cluster-domain-secret"]) > - # "--new-node-certificates"]) > + "--new-rapi-certificate", > "--new-cluster-domain-secret", > + "--new-node-certificates"]) > > # Only renew node certificates > AssertCommand(["gnt-cluster", "renew-crypto", "--force", > -- > 1.9.0.rc1.175.g0b1dcb5 > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
