From d4eea2537cca8ba6133b9fbe97c320a733edf516 Mon Sep 17 00:00:00 2001 From: Luka Peschke Date: Mon, 1 Oct 2018 17:25:14 +0200 Subject: [PATCH] Update fetcher options This updates the options registered in fetcher/__init__.py Following modifications have been done: * Add "fetcher" to common/config.py for config file generation * Update "fetcher/backend" option help * Rename "fetchers_opts" to "fetcher_opts": Only one fetcher per processor is used. This aims at clarifying the code Change-Id: I408d4ea7b8009e90e93c8dc72635c8d362c4598a --- cloudkitty/common/config.py | 2 ++ cloudkitty/fetcher/__init__.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cloudkitty/common/config.py b/cloudkitty/common/config.py index f9dcba8f..8fef26af 100644 --- a/cloudkitty/common/config.py +++ b/cloudkitty/common/config.py @@ -43,6 +43,8 @@ _opts = [ cloudkitty.collector.gnocchi.collector_gnocchi_opts))), ('collector_monasca', list(itertools.chain( cloudkitty.collector.monasca.collector_monasca_opts))), + ('fetcher', list(itertools.chain( + cloudkitty.fetcher.fetcher_opts))), ('fetcher_gnocchi', list(itertools.chain( cloudkitty.fetcher.gnocchi.gfetcher_opts, cloudkitty.fetcher.gnocchi.fetcher_gnocchi_opts))), diff --git a/cloudkitty/fetcher/__init__.py b/cloudkitty/fetcher/__init__.py index b329673f..4c948508 100644 --- a/cloudkitty/fetcher/__init__.py +++ b/cloudkitty/fetcher/__init__.py @@ -22,13 +22,13 @@ from oslo_config import cfg FETCHER_OPTS = 'fetcher' DEPRECATED_FETCHER_OPTS = 'tenant_fetcher' -fetchers_opts = [ +fetcher_opts = [ cfg.StrOpt('backend', default='keystone', - help='Driver used to fetch tenant list.', - deprecated_group=DEPRECATED_FETCHER_OPTS) + help='Driver used to fetch the list of scopes to rate.', + deprecated_group=DEPRECATED_FETCHER_OPTS), ] -cfg.CONF.register_opts(fetchers_opts, 'fetcher') +cfg.CONF.register_opts(fetcher_opts, 'fetcher') @six.add_metaclass(abc.ABCMeta)