diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-26 13:08:23 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-26 20:49:42 +0200 |
commit | c6816f107533d9deca639d3fcb48e65f0980a52f (patch) | |
tree | 334ec8e1ff5307e2d1780d6ae9b018035f68ceda /functest/opnfv_tests/openstack/tempest/conf_utils.py | |
parent | 431dcea1e9882cc0c58f3d23b02e1cbeb1bcf925 (diff) |
Move tempest logics in tempest_conf.yaml
It allows removing OPNFV logics out of Functest (releng) and then
simplifies conf_utils.
tempest.conf is filled by the current default values.
functest-alpine.sh will be updated to allow modifying the default
values without breaking the OPNFV installers.
It deprecates the only tempest-related env var (STORAGE_PROTOCOL)
Change-Id: I14bcb715826ef2d85af87e7af600261a3c08e72c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3872290bb673513459588bbe83e65efc631615f7)
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index e9443d6b3..6d301a624 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -195,7 +195,6 @@ def configure_tempest_update_params( # enable multinode tests rconfig.set('compute', 'min_compute_nodes', compute_cnt) rconfig.set('compute-feature-enabled', 'live_migration', True) - rconfig.set('compute-feature-enabled', 'shelve', False) filters = ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] @@ -219,18 +218,6 @@ def configure_tempest_update_params( rconfig.set('identity', 'admin_role', admin_role_name) rconfig.set('identity', 'admin_domain_scope', True) rconfig.set('identity', 'default_domain_id', domain_id) - rconfig.set('identity-feature-enabled', 'api_v2', False) - rconfig.set('identity-feature-enabled', 'api_v2_admin', False) - if not rconfig.has_section('compute-feature-enabled'): - rconfig.add_section('compute-feature-enabled') - rconfig.set('compute-feature-enabled', 'vnc_console', False) - if not rconfig.has_section('image-feature-enabled'): - rconfig.add_section('image-feature-enabled') - rconfig.set('image-feature-enabled', 'api_v2', True) - rconfig.set('image-feature-enabled', 'api_v1', False) - if not rconfig.has_section('volume-feature-enabled'): - rconfig.add_section('volume-feature-enabled') - rconfig.set('volume-feature-enabled', 'backup', False) if not rconfig.has_section('network'): rconfig.add_section('network') rconfig.set('network', 'default_network', cidr) @@ -241,9 +228,6 @@ def configure_tempest_update_params( getattr(config.CONF, 'tempest_validation_ssh_timeout')) rconfig.set('object-storage', 'operator_role', getattr(config.CONF, 'tempest_object_storage_operator_role')) - if not rconfig.has_section('volume'): - rconfig.add_section('volume') - rconfig.set('volume', 'storage_protocol', env.get('STORAGE_PROTOCOL')) rconfig.set( 'identity', 'v3_endpoint_type', os.environ.get('OS_INTERFACE', 'public')) |