diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-03 11:27:09 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-03 13:11:19 +0100 |
| commit | 8a3e3351b03a24927b6080de3287e410bf82cda8 (patch) | |
| tree | 9cd4130772cb09d0f1ae30759780085a60b5026b | |
| parent | 037c2b090816095cf5ecd7ba90ed8564be4be835 (diff) | |
Stop forcing non default operator role
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 <cedric.ollivier@orange.com>
(cherry picked from commit 543884f5c2100878692260fd840624a549843238)
| -rw-r--r-- | functest/ci/config_functest.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 |
2 files changed, 0 insertions, 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')) |