openstack/barbican
Code Issues Proposed changes

Merge "Add a configurable setting in barbican-functional.conf for SSL"

Browse Source
This commit is contained in:
Jenkins 2016-03-28 04:59:33 +00:00 committed by Gerrit Code Review
commit df8aab57fb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/barbican/barbican-functional.conf
View File

@ -48,6 +48,7 @@ auditor_b_password=barbican
#service_name=barbican
#region_name=RegionOne
#endpoint_type=public
#verify_ssl=True
# use this to increase the timeout (in seconds) when debugging API calls
#timeout=10

2
functionaltests/common/client.py
View File

@ -32,6 +32,7 @@ class BarbicanClient(object):
def __init__(self, api_version='v1'):
self.timeout = CONF.keymanager.timeout
self.verify_ssl = CONF.keymanager.verify_ssl
self.api_version = api_version
self.default_headers = {
'Content-Type': 'application/json',
@ -274,6 +275,7 @@ class BarbicanClient(object):
'headers': headers,
'data': data,
'timeout': self.timeout,
'verify': self.verify_ssl,
'params': params
}
if use_auth:

3
functionaltests/common/config.py
View File

@ -72,7 +72,8 @@ def setup_config(config_file=''):
cfg.StrOpt('endpoint_type', default='public'),
cfg.IntOpt('timeout', default=10),
cfg.StrOpt('override_url', default=''),
cfg.StrOpt('override_url_version', default='')
cfg.StrOpt('override_url_version', default=''),
cfg.BoolOpt('verify_ssl', default=True)
]
TEST_CONF.register_group(keymanager_group)
TEST_CONF.register_opts(keymanager_options, group=keymanager_group)