From 51505ad82b5176cb65e4b887a886802eb0c505db Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Mon, 22 Aug 2016 15:14:38 +0000 Subject: [PATCH] Revert "Fix NoSuchOptError on identity config option lookup" The culprit has been reverted. This reverts commit af9ad0c35e40e91357a7ec41b12416b4ca34cd83. Change-Id: I02c1f357ebfc73aae12964cd5cef2a3a7daa8fa4 --- neutron/tests/tempest/api/clients.py | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/neutron/tests/tempest/api/clients.py b/neutron/tests/tempest/api/clients.py index eb39882b076..c6f41d02a15 100644 --- a/neutron/tests/tempest/api/clients.py +++ b/neutron/tests/tempest/api/clients.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg - from tempest.lib.services.compute import keypairs_client from tempest.lib.services.compute import servers_client from tempest.lib.services.identity.v2 import tenants_client @@ -30,22 +28,12 @@ class Manager(manager.Manager): """ Top level manager for OpenStack tempest clients """ - try: - default_params = { - 'disable_ssl_certificate_validation': - CONF.service_clients.disable_ssl_certificate_validation, - 'ca_certs': CONF.service_clients.ca_certificates_file, - 'trace_requests': CONF.debug.trace_requests - } - except cfg.NoSuchOptError: - # TODO(armax): remove this except when a new tempest release - # > 12.1.0 includes change 1afca56b05 - default_params = { - 'disable_ssl_certificate_validation': - CONF.identity.disable_ssl_certificate_validation, - 'ca_certs': CONF.identity.ca_certificates_file, - 'trace_requests': CONF.debug.trace_requests - } + default_params = { + 'disable_ssl_certificate_validation': + CONF.identity.disable_ssl_certificate_validation, + 'ca_certs': CONF.identity.ca_certificates_file, + 'trace_requests': CONF.debug.trace_requests + } # NOTE: Tempest uses timeout values of compute API if project specific # timeout values don't exist.