do not include [*-feature-enabled] sections in tempest.conf

We should not include [*-feature-enabled] sections in tempest.conf and use
``tempest_tempest_conf_overrides`` for these customizations instead.

There is no way we can keep feature list updated all the time and cover all
possible features in defaults/main.yml.
That's why I think we shouldn't cover them here at all.

If we need these customizations for testing purposed(tested it and I think we
don't), we should define them using ``tempest_tempest_conf_overrides`` only for
these tests.

Change-Id: If7d7ca5ae76cb3cb24f95fb9608ce3e1182d5e5a
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/825166
This commit is contained in:
Damian Dabrowski 2022-01-18 20:31:49 +01:00
parent c34cf166de
commit f82ea26fcb
3 changed files with 19 additions and 69 deletions

View File

@ -155,13 +155,8 @@ tempest_public_router_external: "True"
# tempest_public_subnet_allocation_pools: "10.1.13.150-10.1.13.200"
tempest_public_subnet_allocation_pools: ""
tempest_compute_ssh_user: cirros
tempest_compute_image_ssh_user: cirros
tempest_compute_run_ssh: True
tempest_compute_console_output_enabled: True
tempest_compute_resize_enabled: True
tempest_compute_snapshot_enabled: True
tempest_compute_change_password: False
tempest_network_ping_gateway: False
tempest_dashboard_url: "https://{{ external_lb_vip_address | default('127.0.0.1') }}/"
@ -212,23 +207,7 @@ tempest_service_available_whitebox: False
tempest_service_available_zaqar: "{{ groups['zaqar_all'] is defined and groups['zaqar_all'] | length > 0 }}"
tempest_service_available_zun: "{{ groups['zun_all'] is defined and groups['zun_all'] | length > 0 }}"
tempest_image_api_v1_enabled: False
tempest_image_api_v2_enabled: True
tempest_swift_enabled: True
tempest_swift_container_sync: True
tempest_swift_object_versioning: True
tempest_swift_discoverable_apis:
- bulk
- object
- container_quotas
- container_sync
- slo
- tempurl
tempest_volume_backend_names: [ backend1, backend2 ]
tempest_volume_backup_enabled: False
tempest_volume_multi_backend_enabled: False
# Var for setting ssl verification
tempest_keystone_interface_insecure: "{{ (keystone_service_internaluri_insecure | default(false)) | bool }}"
@ -274,8 +253,6 @@ tempest_images: "{{ tempest_images_map[ansible_facts['architecture']] }}"
# The location where images are downloaded to
tempest_image_dir: "{{ lookup('env', 'HOME') }}/tempest-images"
tempest_enable_instance_password: True
tempest_flavors:
- name: tempest1
id: 201

View File

@ -0,0 +1,19 @@
---
deprecations:
- |
Following tempest related variables were deprecated and have no effect:
* tempest_compute_ssh_user
* tempest_compute_console_output_enabled
* tempest_compute_resize_enabled
* tempest_compute_snapshot_enabled
* tempest_compute_change_password
* tempest_image_api_v1_enabled
* tempest_image_api_v2_enabled
* tempest_swift_container_sync
* tempest_swift_object_versioning
* tempest_swift_discoverable_apis
* tempest_volume_backup_enabled
* tempest_volume_multi_backend_enabled
* tempest_enable_instance_password
* tempest_volume_backend_names

View File

@ -29,24 +29,6 @@ endpoint_type = {{ tempest_endpoint_type }}
build_timeout = 600
[compute-feature-enabled]
change_password = {{ tempest_compute_change_password }}
console_output = {{ tempest_compute_console_output_enabled }}
resize = {{ tempest_compute_resize_enabled }}
pause = false
shelve = false
suspend = false
live_migration = false
block_migration_for_live_migration = false
block_migrate_cinder_iscsi = false
spice_console = true
config_drive = {{ ansible_facts['architecture'] != 'aarch64' }}
rescue = false
enable_instance_password = {{ tempest_enable_instance_password }}
interface_attach = false
snapshot = {{ tempest_compute_resize_enabled }}
[data_processing]
endpoint_type = {{ tempest_endpoint_type }}
@ -62,22 +44,12 @@ v2_public_endpoint_type = {{ tempest_endpoint_type }}
v3_endpoint_type = {{ tempest_endpoint_type }}
[identity-feature-enabled]
trust = true
application_credentials = true
[image]
endpoint_type = {{ tempest_endpoint_type }}
http_image = {{ tempest_images[0]['url'] }}
build_timeout = 600
[image-feature-enabled]
api_v1 = {{ tempest_image_api_v1_enabled }}
api_v2 = {{ tempest_image_api_v2_enabled }}
[input-scenario]
[messaging]
@ -93,23 +65,11 @@ floating_network_name = {{ tempest_public_net_name }}
build_timeout = 600
[network-feature-enabled]
port_security = true
ipv6 = false
api_extensions = agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw-mode,external-net,extra_dhcp_opt,extra_dhcp_optagent,extraroute,l3_agent_scheduler,metering,provider,quotas,router,security-group,service-type,subnet_allocation
[object-storage]
endpoint_type = {{ tempest_endpoint_type }}
operator_role = swiftoperator
[object-storage-feature-enabled]
container_sync = {{ tempest_swift_container_sync }}
object_versioning = {{ tempest_swift_object_versioning }}
discoverable_apis = {{ tempest_swift_discoverable_apis | join(',') }}
[heat_plugin]
endpoint_type = {{ tempest_endpoint_type }}
instance_type = tempest1
@ -169,10 +129,4 @@ ssh_timeout = 600
[volume]
endpoint_type = {{ tempest_endpoint_type }}
catalog_type = volumev3
# NOTE: These backends are only tested when multi_backend is enabled
backend_names = {{ tempest_volume_backend_names | join(',') }}
build_timeout = 600
[volume-feature-enabled]
backup = {{ tempest_volume_backup_enabled }}
multi_backend = {{ tempest_volume_multi_backend_enabled }}