commit 99b3611dbf8c3dcc1d8f50557a4632e72757a4a3
author Jenkins <jenkins@review.openstack.org> Fri Apr 11 10:20:56 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Apr 11 10:20:56 2014 +0000
tree d3a19c55f42f3dafafffdcc8c9d3a65cb3f479ac
parent 9e9b394b98d8125d47a4cbc26aadbbd33cbffcbb
parent 1aba5d0dd7a14dce25bb159f5eca1ac905122f72

Merge "Cinder client does not honor disable_ssl_certificate_validation"

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index 444b4d9..ab89cfa 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -550,6 +550,7 @@
         auth_url = CONF.identity.uri
         region = CONF.identity.region
         endpoint_type = CONF.volume.endpoint_type
+        dscv = CONF.identity.disable_ssl_certificate_validation
         return cinderclient.client.Client(self.CINDERCLIENT_VERSION,
                                           username,
                                           password,
@@ -557,6 +558,7 @@
                                           auth_url,
                                           region_name=region,
                                           endpoint_type=endpoint_type,
+                                          insecure=dscv,
                                           http_log_debug=True)
 
     def _get_object_storage_client(self, username, password, tenant_name):