From 7e53a395dca4670e4e211c6b37bf259f43098b96 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 28 Apr 2020 01:25:18 +0200
Subject: Move static data to tempest_conf.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I99f33f2e5f27c22c597f7c4f2f864710ceb1350e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/smoke-cntt/tempest_conf.yaml | 1 +
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 1 +
.../opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml | 1 +
functest/opnfv_tests/openstack/tempest/tempest.py | 1 -
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index ce0e0eed1..76afc4661 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -33,6 +33,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 1b8f61d2c..b73e917ad 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -33,6 +33,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 c1165b72a..b55259a58 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -33,6 +33,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 a8ea9af39..a996171e4 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -283,7 +283,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'):
--
cgit