+1 for making that an explicit test. LGTM, thanks
On Fri, 13 Nov 2015 at 11:18 'Hrvoje Ribicic' via ganeti-devel < [email protected]> wrote: > The downgrade/upgrade QA test starts from a freshly-built cluster which > would have RSA keys in 2.16. Downgrading such a cluster is prevented by > one of the preceding patches, for good reason, so this patch makes sure > to switch to DSA keys before running the upgrade test. > > As this code is meant to be here only in 2.16, it also includes a kill > switch in case it is merged up silently. > > Signed-off-by: Hrvoje Ribicic <[email protected]> > --- > qa/qa_cluster.py | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index a0b553e..1ad2fb9 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -1394,6 +1394,14 @@ def TestUpgrade(): > nodes = qa_config.AcquireManyNodes(n) > live_instances.append(cf(nodes)) > > + # 2.16 only - prior to performing a downgrade, we have to make sure > that the > + # SSH keys used are such that the lower version can still use them, > + # regardless of cluster defaults. > + if constants.VERSION_MINOR != 16: > + raise qa_error.Error("Please remove the key type downgrade code in > 2.17") > + AssertCommand(["gnt-cluster", "renew-crypto", "--no-ssh-key-check", > "-f", > + "--new-ssh-keys", "--ssh-key-type=dsa"]) > + > AssertRedirectedCommand(["gnt-cluster", "upgrade", "--to", > other_version]) > AssertRedirectedCommand(["gnt-cluster", "verify"]) > > -- > 2.6.0.rc2.230.g3dd15c0 > > -- Helga Velroyen Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
