openstack/cloudkitty
Code Issues Proposed changes

Add support for cafile option in the gnocchi fetcher

Browse Source 
Change-Id: Id0c8e8ada7fae6fd663a6421d38507c7f1bde891
This commit is contained in:
Luka Peschke
2019-01-08 15:41:08 +01:00
parent e8e175e74f
commit 838ec237e4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cloudkitty/fetcher/gnocchi.py
View File

@@ -61,7 +61,8 @@ gfetcher_opts = [
cfg.StrOpt( cfg.StrOpt(
'region_name', 'region_name',
default='RegionOne', default='RegionOne',
help='Region Name'), help='Region Name',
),
] ]
@@ -83,6 +84,7 @@ class GnocchiFetcher(fetcher.BaseFetcher):
def __init__(self): def __init__(self):
super(GnocchiFetcher, self).__init__() super(GnocchiFetcher, self).__init__()
adapter_options = {'connect_retries': 3} adapter_options = {'connect_retries': 3}
if CONF.fetcher_gnocchi.gnocchi_auth_type == 'keystone': if CONF.fetcher_gnocchi.gnocchi_auth_type == 'keystone':
auth_plugin = ks_loading.load_auth_from_conf_options( auth_plugin = ks_loading.load_auth_from_conf_options(
@@ -97,9 +99,15 @@ class GnocchiFetcher(fetcher.BaseFetcher):
) )
adapter_options['region_name'] = CONF.fetcher_gnocchi.region_name adapter_options['region_name'] = CONF.fetcher_gnocchi.region_name
verify = True
if CONF.fetcher_gnocchi.cafile:
verify = CONF.fetcher_gnocchi.cafile
elif CONF.fetcher_gnocchi.insecure:
verify = False
self._conn = gclient.Client( self._conn = gclient.Client(
'1', '1',
session_options={'auth': auth_plugin}, session_options={'auth': auth_plugin, 'verify': verify},
adapter_options=adapter_options, adapter_options=adapter_options,
) )