Move static data to tempest_conf.yaml

Change-Id: I99f33f2e5f27c22c597f7c4f2f864710ceb1350e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 7e53a395dca4670e4e211c6b37bf259f43098b96)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index dc13d6c..e482301 100644 (file)
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -34,6 +34,7 @@ compute-feature-enabled:
     volume_backed_live_migration: false
     volume_multiattach: false
 identity:
+    auth_version: v3
     user_unique_last_password_count: 2
     user_lockout_duration: 10
     user_lockout_failure_attempts: 2

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 314ccd8..207ef25 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -34,6 +34,7 @@ compute-feature-enabled:
     volume_backed_live_migration: false
     volume_multiattach: false
 identity:
+    auth_version: v3
     user_unique_last_password_count: 2
     user_lockout_duration: 10
     user_lockout_failure_attempts: 2

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index 3694f01..2fa67a5 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -34,6 +34,7 @@ compute-feature-enabled:
     volume_backed_live_migration: false
     volume_multiattach: false
 identity:
+    auth_version: v3
     user_unique_last_password_count: 2
     user_lockout_duration: 10
     user_lockout_failure_attempts: 2

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 830799e..310d9d3 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -290,7 +290,6 @@ class TempestCommon(singlevm.VmReady2):
             assert os.path.exists(
                 account_file), "{} doesn't exist".format(account_file)
             rconfig.set('auth', 'test_accounts_file', account_file)
-        rconfig.set('identity', 'auth_version', 'v3')
         rconfig.set('identity', 'admin_role', admin_role_name)
         rconfig.set('identity', 'default_domain_id', domain_id)
         if not rconfig.has_section('network'):