Stop forcing admin_scope_domain = True

tempest fails vs devstack stable/stein and it passes successfully vs
devstack stable/rocky (Functest gates) without that option.

It may be added to tempest_conf.yaml if SUT requires it.

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

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 7e42ad3..a4cdec6 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -158,7 +158,6 @@ def configure_tempest_update_params(
         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', 'admin_domain_scope', True)
     rconfig.set('identity', 'default_domain_id', domain_id)
     if not rconfig.has_section('network'):
         rconfig.add_section('network')