Merge "Add support for cafile option in the gnocchi collector"

This commit is contained in:
Zuul 2018-09-20 08:43:41 +00:00 committed by Gerrit Code Review
commit 935be4931e
1 changed files with 9 additions and 2 deletions

View File

@ -58,7 +58,8 @@ gcollector_opts = [
cfg.StrOpt(
'region_name',
default='RegionOne',
help='Region Name'),
help='Region Name',
),
]
cfg.CONF.register_opts(gnocchi_collector_opts, GNOCCHI_COLLECTOR_OPTS)
@ -108,9 +109,15 @@ class GnocchiCollector(collector.BaseCollector):
)
adapter_options['region_name'] = CONF.gnocchi_collector.region_name
verify = True
if CONF.gnocchi_collector.cafile:
verify = CONF.gnocchi_collector.cafile
elif CONF.gnocchi_collector.insecure:
verify = False
self._conn = gclient.Client(
'1',
session_options={'auth': auth_plugin},
session_options={'auth': auth_plugin, 'verify': verify},
adapter_options=adapter_options,
)