LGTM, thanks On Wed, 14 Oct 2015 at 12:26 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> In 2.17, an additional data collector has been added, named kvm-inst-rss. > So, the 2.17 configuration also contains an entry for this collector; when > downgrading to 2.17 remove this entry as well. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/tools/cfgupgrade.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lib/tools/cfgupgrade.py b/lib/tools/cfgupgrade.py > index cbcb675..bc091da 100644 > --- a/lib/tools/cfgupgrade.py > +++ b/lib/tools/cfgupgrade.py > @@ -717,11 +717,11 @@ class CfgUpgrade(object): > cluster = self.config_data["cluster"] > if "diagnose_data_collector_filename" in cluster: > del cluster["diagnose_data_collector_filename"] > - if ("data_collectors" in cluster and > - constants.DATA_COLLECTOR_DIAGNOSE in > - cluster["data_collectors"]): > - del (cluster["data_collectors"] > - [constants.DATA_COLLECTOR_DIAGNOSE]) > + if "data_collectors" in cluster: > + if constants.DATA_COLLECTOR_DIAGNOSE in > cluster["data_collectors"]: > + del > cluster["data_collectors"][constants.DATA_COLLECTOR_DIAGNOSE] > + if constants.DATA_COLLECTOR_KVM_R_S_S in > cluster["data_collectors"]: > + del > cluster["data_collectors"][constants.DATA_COLLECTOR_KVM_R_S_S] > if "ipolicy" in cluster: > ipolicy = cluster["ipolicy"] > if "memory-ratio" in ipolicy: > -- > 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.
