From 61b13d06db5a37da04e599f4baf9adca0166edf2 Mon Sep 17 00:00:00 2001
From: Anand Shanmugam <anand1712@gmail.com>
Date: Fri, 26 Feb 2016 13:28:47 -0800
Subject: [PATCH] Adding ssl verification if it is present
Change-Id: Ife22bf324a130816fd9ba0a8b07947648b796160
---
cloudpulse/openstack/api/neutron_api.py | 1 +
cloudpulse/scenario/plugins/endpoint_tests/endpoint.py | 3 +++
2 files changed, 4 insertions(+)
diff --git a/cloudpulse/openstack/api/neutron_api.py b/cloudpulse/openstack/api/neutron_api.py
index 0385897..35b4b1a 100644
--- a/cloudpulse/openstack/api/neutron_api.py
+++ b/cloudpulse/openstack/api/neutron_api.py
@@ -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):
diff --git a/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py b/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
index 95c3eee..c5d699e 100644
--- a/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
+++ b/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
@@ -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)