Adding ssl verification if it is present
Change-Id: Ife22bf324a130816fd9ba0a8b07947648b796160
This commit is contained in:
parent
e787448eea
commit
61b13d06db
cloudpulse
@ -17,6 +17,7 @@ from neutronclient.v2_0 import client as neutron_client
|
||||
class NeutronHealth(object):
|
||||
def __init__(self, creds):
|
||||
creds['timeout'] = 30
|
||||
creds['ca_cert'] = creds['cacert']
|
||||
self.neutronclient = neutron_client.Client(**creds)
|
||||
|
||||
def neutron_agent_list(self):
|
||||
|
@ -49,6 +49,7 @@ CONF.register_opts(TESTS_OPTS, periodic_test_group)
|
||||
|
||||
|
||||
class endpoint_scenario(base.Scenario):
|
||||
|
||||
def _get_credentials(self):
|
||||
importutils.import_module('keystonemiddleware.auth_token')
|
||||
creds = {}
|
||||
@ -56,6 +57,7 @@ class endpoint_scenario(base.Scenario):
|
||||
creds['tenant_name'] = cfg.CONF.keystone_authtoken.project_name
|
||||
creds['password'] = cfg.CONF.keystone_authtoken.password
|
||||
creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri
|
||||
creds['cacert'] = cfg.CONF.keystone_authtoken.cafile
|
||||
return creds
|
||||
|
||||
def _get_nova_v2_credentials(self):
|
||||
@ -66,6 +68,7 @@ class endpoint_scenario(base.Scenario):
|
||||
creds['api_key'] = cfg.CONF.keystone_authtoken.password
|
||||
creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri
|
||||
creds['version'] = 2
|
||||
creds['cacert'] = cfg.CONF.keystone_authtoken.cafile
|
||||
return creds
|
||||
|
||||
@base.scenario(admin_only=False, operator=False)
|
||||
|
Loading…
x
Reference in New Issue
Block a user