From 8a3e3351b03a24927b6080de3287e410bf82cda8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 3 Mar 2019 11:27:09 +0100 Subject: [PATCH] Stop forcing non default operator role MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Member is the default value [1] and SwiftOperator is not created by default in OpenStack gates (devstack) This role should be modified by tempest custom yaml file instead. [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: Ie77b91e36a7011e5730cbf5998e029c07ec7fe2f Signed-off-by: Cédric Ollivier (cherry picked from commit 543884f5c2100878692260fd840624a549843238) --- functest/ci/config_functest.yaml | 2 -- functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index dbea320c9..eded26e75 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -139,8 +139,6 @@ tempest: user_password: Tempest123! validation: ssh_timeout: 130 - object_storage: - operator_role: SwiftOperator # network_type: vlan # physical_network: physnet2 # segmentation_id: 2366 diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index d490ab036..5639f431c 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -168,8 +168,6 @@ def configure_tempest_update_params( rconfig.set( 'validation', 'ssh_timeout', getattr(config.CONF, 'tempest_validation_ssh_timeout')) - rconfig.set('object-storage', 'operator_role', - getattr(config.CONF, 'tempest_object_storage_operator_role')) rconfig.set( 'identity', 'v3_endpoint_type', os.environ.get('OS_INTERFACE', 'public')) -- 2.16.6