Merge "Add missing ssl_verify for swift in scenario tests"
This commit is contained in:
commit
ba6d3d5ad6
@ -120,10 +120,13 @@ class BaseTestCase(base.BaseTestCase):
|
||||
self.nova = clients.NovaClient(session=session)
|
||||
self.neutron = clients.NeutronClient(session=session)
|
||||
# swiftclient doesn't support keystone sessions
|
||||
self.swift = clients.SwiftClient(authurl=auth_url,
|
||||
user=username,
|
||||
key=password,
|
||||
tenant_name=tenant_name)
|
||||
self.swift = clients.SwiftClient(
|
||||
authurl=auth_url,
|
||||
user=username,
|
||||
key=password,
|
||||
insecure=self.credentials['ssl_verify'],
|
||||
cacert=self.credentials['ssl_cert'],
|
||||
tenant_name=tenant_name)
|
||||
|
||||
def create_cluster(self):
|
||||
self.ng_id_map = self._create_node_group_templates()
|
||||
|
@ -171,6 +171,8 @@ class TestBase(testtools.TestCase):
|
||||
swift.assert_called_with(auth_version='2.0',
|
||||
user='admin',
|
||||
key='nova',
|
||||
insecure=True,
|
||||
cacert='/etc/tests/cert.crt',
|
||||
tenant_name='admin',
|
||||
authurl='http://localhost:5000/v2.0')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user