Fix default identity version in conf_utils
authorCédric Ollivier <cedric.ollivier@orange.com>
Sun, 25 Feb 2018 14:01:27 +0000 (15:01 +0100)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sun, 25 Feb 2018 14:01:27 +0000 (15:01 +0100)
Change-Id: I2e78958b3c96b36a5fac636a1817424fb102afea
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
functest/opnfv_tests/openstack/tempest/conf_utils.py

index 6fc44d8..786a7c5 100644 (file)
@@ -254,8 +254,7 @@ def configure_tempest_update_params(tempest_conf_file, network_name=None,
         rconfig.set('compute-feature-enabled', 'live_migration', True)
 
     rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME'))
-    identity_api_version = os.environ.get(
-        "OS_IDENTITY_API_VERSION", os.environ.get("IDENTITY_API_VERSION"))
+    identity_api_version = os.environ.get("OS_IDENTITY_API_VERSION", '3')
     if identity_api_version == '3':
         auth_version = 'v3'
         rconfig.set('identity-feature-enabled', 'api_v2', False)