LGTM On Tue, Sep 29, 2015 at 5:21 PM, 'Hrvoje Ribicic' via ganeti-devel < [email protected]> wrote:
> When the cluster refreshes the RAPI certificate as it does in the > renew-crypto test, the stored certificate in the curl config of the > RAPI client has to be renewed. But it should only be renewed when the > test is enabled, so this patch moves that code into the test. > > Signed-off-by: Hrvoje Ribicic <[email protected]> > --- > qa/ganeti-qa.py | 4 ---- > qa/qa_cluster.py | 5 +++++ > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py > index 9c8a058..fa54bd7 100755 > --- a/qa/ganeti-qa.py > +++ b/qa/ganeti-qa.py > @@ -238,10 +238,6 @@ def RunClusterTests(): > ]: > RunTestIf(test, fn) > > - # Since renew-crypto replaces the RAPI cert, reload it. > - if qa_rapi.Enabled(): > - qa_rapi.ReloadCertificates() > - > for test, fn in [ > ("cluster-verify", qa_cluster.TestClusterVerify), > ("cluster-reserved-lvs", qa_cluster.TestClusterReservedLvs), > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index cf4a08e..e33552e 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -48,6 +48,7 @@ import qa_error > import qa_instance > import qa_job_utils > import qa_logging > +import qa_rapi > import qa_utils > > from qa_utils import AssertEqual, AssertCommand, GetCommandOutput, \ > @@ -1240,6 +1241,10 @@ def TestClusterRenewCrypto(): > finally: > AssertCommand(["rm", "-f", rapi_cert_backup]) > > + # Since renew-crypto replaced the RAPI cert, reload it. > + if qa_rapi.Enabled(): > + qa_rapi.ReloadCertificates() > + > > def TestClusterBurnin(): > """Burnin""" > -- > 2.6.0.rc2.230.g3dd15c0 > > -- Lisa Velden Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Graham Law, Christine Elizabeth Flores Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
