openstack/cloudkitty
Code Issues Proposed changes

Merge "Register keystone auth options with keystoneauth1 helper functions"

Browse Source
This commit is contained in:
Zuul
2019-09-24 15:17:42 +00:00
committed by Gerrit Code Review
parent 1f757ee0c9 3cab85a1c2
commit fec8682c3d
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cloudkitty/collector/monasca.py
View File

@@ -34,9 +34,6 @@ LOG = logging.getLogger(__name__)
MONASCA_API_VERSION = '2_0'
COLLECTOR_MONASCA_OPTS = 'collector_monasca'
keystone_opts = ks_loading.get_auth_common_conf_options() + \
ks_loading.get_session_conf_options()
collector_monasca_opts = [
cfg.StrOpt(
'interface',
@@ -51,8 +48,10 @@ collector_monasca_opts = [
]
CONF = cfg.CONF
CONF.register_opts(keystone_opts, COLLECTOR_MONASCA_OPTS)
CONF.register_opts(collector_monasca_opts, COLLECTOR_MONASCA_OPTS)
ks_loading.register_auth_conf_options(CONF, COLLECTOR_MONASCA_OPTS)
ks_loading.register_session_conf_options(CONF, COLLECTOR_MONASCA_OPTS)
METRICS_CONF = ck_utils.load_conf(CONF.collect.metrics_conf)

1
cloudkitty/common/config.py
View File

@@ -44,7 +44,6 @@ _opts = [
('collector_gnocchi', list(itertools.chain(
cloudkitty.collector.gnocchi.collector_gnocchi_opts))),
('collector_monasca', list(itertools.chain(
cloudkitty.collector.monasca.keystone_opts,
cloudkitty.collector.monasca.collector_monasca_opts))),
('collector_prometheus', list(itertools.chain(
cloudkitty.collector.prometheus.collector_prometheus_opts))),

6
releasenotes/notes/register-keystone-opts-with-keystoneauth-functions-monasca-collector-1a539fc8c23e9dbc.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Keystone authentication options are now registered with ``keystoneauth1`` in
the monasca collector helper functions, which allows to use the
``auth_section`` option even when using the ``source`` fetcher.