openstack/neutron
Code Issues Proposed changes

Revert "Fix NoSuchOptError on identity config option lookup"

Browse Source 
The culprit has been reverted.

This reverts commit af9ad0c35e.

Change-Id: I02c1f357ebfc73aae12964cd5cef2a3a7daa8fa4
This commit is contained in:
Armando Migliaccio 2016-08-22 15:14:38 +00:00
parent af9ad0c35e
commit 51505ad82b
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
neutron/tests/tempest/api/clients.py
View File

@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from tempest.lib.services.compute import keypairs_client from tempest.lib.services.compute import keypairs_client
from tempest.lib.services.compute import servers_client from tempest.lib.services.compute import servers_client
from tempest.lib.services.identity.v2 import tenants_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 Top level manager for OpenStack tempest clients
""" """
try: default_params = {
default_params = { 'disable_ssl_certificate_validation':
'disable_ssl_certificate_validation': CONF.identity.disable_ssl_certificate_validation,
CONF.service_clients.disable_ssl_certificate_validation, 'ca_certs': CONF.identity.ca_certificates_file,
'ca_certs': CONF.service_clients.ca_certificates_file, 'trace_requests': CONF.debug.trace_requests
'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
}
# NOTE: Tempest uses timeout values of compute API if project specific # NOTE: Tempest uses timeout values of compute API if project specific
# timeout values don't exist. # timeout values don't exist.