Merge "Add missing ssl_verify for swift in scenario tests"

This commit is contained in:
Jenkins 2015-09-03 03:38:36 +00:00 committed by Gerrit Code Review
commit ba6d3d5ad6
2 changed files with 9 additions and 4 deletions

View File

@ -120,10 +120,13 @@ class BaseTestCase(base.BaseTestCase):
self.nova = clients.NovaClient(session=session) self.nova = clients.NovaClient(session=session)
self.neutron = clients.NeutronClient(session=session) self.neutron = clients.NeutronClient(session=session)
# swiftclient doesn't support keystone sessions # swiftclient doesn't support keystone sessions
self.swift = clients.SwiftClient(authurl=auth_url, self.swift = clients.SwiftClient(
user=username, authurl=auth_url,
key=password, user=username,
tenant_name=tenant_name) key=password,
insecure=self.credentials['ssl_verify'],
cacert=self.credentials['ssl_cert'],
tenant_name=tenant_name)
def create_cluster(self): def create_cluster(self):
self.ng_id_map = self._create_node_group_templates() self.ng_id_map = self._create_node_group_templates()

View File

@ -171,6 +171,8 @@ class TestBase(testtools.TestCase):
swift.assert_called_with(auth_version='2.0', swift.assert_called_with(auth_version='2.0',
user='admin', user='admin',
key='nova', key='nova',
insecure=True,
cacert='/etc/tests/cert.crt',
tenant_name='admin', tenant_name='admin',
authurl='http://localhost:5000/v2.0') authurl='http://localhost:5000/v2.0')