diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-28 01:25:18 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-28 01:26:30 +0200 |
| commit | 4a62d199a823392d5f64345ef8099f68cefa7077 (patch) | |
| tree | cfe2360eb68bf4bcf13a59313a75b2c37813bd5e | |
| parent | fb57426f0007fe96392996124426e1c5825bf4ed (diff) | |
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)
4 files changed, 3 insertions, 1 deletions
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml index 318606d1d..188d95939 100644 --- 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 9d948ec7c..7cfc43e4b 100644 --- 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 1ab2f9ffb..a8cc6cb34 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 @@ -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 830799e4b..310d9d35b 100644 --- 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'): |