Revert "Fix NoSuchOptError on identity config option lookup"

Tempest's patch that causes the dr job failure has been reverted.
  I91600d8fc49db670b0f78ffd0094575fbfa0ca63

This reverts commit d23f8f7db4.

Change-Id: I92380d61204ef4ab91dedba5317cb6fbd4327590
This commit is contained in:
fumihiko kakuma 2016-08-22 21:59:47 +00:00
parent d23f8f7db4
commit 3ffe5283df
1 changed files with 2 additions and 11 deletions

View File

@ -13,8 +13,6 @@
# under the License.
import netaddr
from oslo_config import cfg
from tempest import config
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -35,15 +33,8 @@ def _setup_client_args(auth_provider):
build_timeout = CONF.network.build_timeout
# The disable_ssl appears in identity
try:
disable_ssl_certificate_validation = (
CONF.service_clients.disable_ssl_certificate_validation)
except cfg.NoSuchOptError:
# TODO(kakuma): This except must be removed when a new tempest
# release includes the following change.
# Change-Id: I296f1080ce89f0cdceae1c476866b215393b2605
disable_ssl_certificate_validation = (
CONF.identity.disable_ssl_certificate_validation)
disable_ssl_certificate_validation = (
CONF.identity.disable_ssl_certificate_validation)
ca_certs = None
# Trace in debug section