LGTM, thanks for taking care of this!
On Thu, Jan 9, 2014 at 3:36 PM, Klaus Aehlig <[email protected]> wrote: > While version 2.10 ignores any leftover client certificates, their > presence will prevent a the cluster working after an upgrade back > to version 2.11 again. So we have to remove them right at the > downgrade. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/client/gnt_cluster.py | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py > index e1005b1..8a3605c 100644 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@ -1881,6 +1881,22 @@ def _VersionSpecificDowngrade(): > """ > ToStdout("Performing version-specific downgrade tasks.") > > + ToStdout("...removing client certificates ssconf file") > + ssconffile = ssconf.SimpleStore().KeyToFilename( > + constants.SS_MASTER_CANDIDATES_CERTS) > + badnodes = _VerifyCommand(["rm", "-f", ssconffile]) > + if badnodes: > + ToStderr("Warning: failed to clean up ssconf on %s." > + % (", ".join(badnodes),)) > + return False > + > + ToStdout("...removing client certificates") > + badnodes = _VerifyCommand(["rm", "-f", > pathutils.NODED_CLIENT_CERT_FILE]) > + if badnodes: > + ToStderr("Warning: failed to clean up certificates on %s." > + % (", ".join(badnodes),)) > + return False > + > return True > > > -- > 1.8.5.1 > > -- -- 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
