openstack
/
openstack-ansible-os_tempest
Code Issues Proposed changes

Make _tempest_plugins a list of dicts. 

For some reason we define a list inside a _tempest_plugins dict.

It should be simplified to the list of dicts.

Change-Id: I891f77e3e22c962615697504d0870e25017511d7
This commit is contained in:
Damian Dabrowski 2022-07-04 15:48:52 +02:00
parent 56c07080a7
commit 021f18905f
3 changed files with 90 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
defaults/main.yml
View File

@ -90,13 +90,15 @@ tempest_log_dir: "/var/log/tempest"
# By default, the following tempest plugins are installed. # By default, the following tempest plugins are installed.
# Override ``tempest_plugins`` variable with your own plugins, depending # Override ``tempest_plugins`` variable with your own plugins, depending
# on your installation. # on your installation.
# The structure of each item of the list is the following: # Example structure:
# - name: designate-tempest-plugin #name of the plugin # - name: designate-tempest-plugin #name of the plugin
# repo: https://opendev.org/openstack/designate-tempest-plugin #for installing the plugin from sources # repo: https://opendev.org/openstack/designate-tempest-plugin #for installing the plugin from sources
# branch: master #for installing the plugin from sources # branch: master #for installing the plugin from sources
# - name: ironic-tempest-plugin # install: true
# package: ironic #for installing the plugin from packages # - name: ironic-tempest-plugin
tempest_plugins: "{{ _tempest_plugins.values() | sum(start=[]) | selectattr('install', 'equalto', true) | list }}" # package: ironic #for installing the plugin from packages
# install: true
tempest_plugins: "{{ _tempest_plugins | selectattr('install', 'equalto', true) }}"
tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin
tempest_plugin_barbican_git_install_branch: master tempest_plugin_barbican_git_install_branch: master

1
tests/os_tempest-overrides.yml
View File

@ -24,6 +24,7 @@ tempest_plugins:
- name: sahara-tests - name: sahara-tests
repo: https://opendev.org/openstack/sahara-tests repo: https://opendev.org/openstack/sahara-tests
branch: master branch: master
install: true
neutron_provider_networks: neutron_provider_networks:
network_types: "vxlan,flat" network_types: "vxlan,flat"

180
vars/main.yml
View File

@ -51,103 +51,83 @@ tempest_images_map:
# install: # boolean to enable/disable the installation of this item # install: # boolean to enable/disable the installation of this item
_tempest_plugins: _tempest_plugins:
barbican: - name: barbican-tempest-plugin
- name: barbican-tempest-plugin repo: "{{ tempest_plugin_barbican_git_repo }}"
repo: "{{ tempest_plugin_barbican_git_repo }}" branch: "{{ tempest_plugin_barbican_git_install_branch }}"
branch: "{{ tempest_plugin_barbican_git_install_branch }}" install: "{{ tempest_service_available_barbican | bool }}"
install: "{{ tempest_service_available_barbican | bool }}" - name: cinder-tempest-plugin
cinder: repo: "{{ tempest_plugin_cinder_git_repo }}"
- name: cinder-tempest-plugin branch: "{{ tempest_plugin_cinder_git_install_branch }}"
repo: "{{ tempest_plugin_cinder_git_repo }}" install: "{{ tempest_service_available_cinder | bool }}"
branch: "{{ tempest_plugin_cinder_git_install_branch }}" - name: cloudkitty-tempest-plugin
install: "{{ tempest_service_available_cinder | bool }}" repo: "{{ tempest_plugin_cloudkitty_git_repo }}"
cloudkitty: branch: "{{ tempest_plugin_cloudkitty_git_install_branch }}"
- name: cloudkitty-tempest-plugin install: "{{ tempest_service_available_cloudkitty | bool }}"
repo: "{{ tempest_plugin_cloudkitty_git_repo }}" - name: designate-tempest-plugin
branch: "{{ tempest_plugin_cloudkitty_git_install_branch }}" repo: "{{ tempest_plugin_designate_git_repo }}"
install: "{{ tempest_service_available_cloudkitty | bool }}" branch: "{{ tempest_plugin_designate_git_install_branch }}"
designate: install: "{{ tempest_service_available_designate | bool }}"
- name: designate-tempest-plugin - name: glance-tempest-plugin
repo: "{{ tempest_plugin_designate_git_repo }}" repo: "{{ tempest_plugin_glance_git_repo }}"
branch: "{{ tempest_plugin_designate_git_install_branch }}" branch: "{{ tempest_plugin_glance_git_install_branch }}"
install: "{{ tempest_service_available_designate | bool }}" install: "{{ tempest_service_available_glance | bool }}"
glance: - name: heat-tempest-plugin
- name: glance-tempest-plugin repo: "{{ tempest_plugin_heat_git_repo }}"
repo: "{{ tempest_plugin_glance_git_repo }}" branch: "{{ tempest_plugin_heat_git_install_branch }}"
branch: "{{ tempest_plugin_glance_git_install_branch }}" install: "{{ tempest_service_available_heat | bool }}"
install: "{{ tempest_service_available_glance | bool }}" - name: ironic-tempest-plugin
heat: repo: "{{ tempest_plugin_ironic_git_repo }}"
- name: heat-tempest-plugin branch: "{{ tempest_plugin_ironic_git_install_branch }}"
repo: "{{ tempest_plugin_heat_git_repo }}" install: "{{ tempest_service_available_ironic | bool }}"
branch: "{{ tempest_plugin_heat_git_install_branch }}" - name: keystone-tempest-plugin
install: "{{ tempest_service_available_heat | bool }}" repo: "{{ tempest_plugin_keystone_git_repo }}"
ironic: branch: "{{ tempest_plugin_keystone_git_install_branch }}"
- name: ironic-tempest-plugin install: yes
repo: "{{ tempest_plugin_ironic_git_repo }}" - name: magnum-tempest-plugin
branch: "{{ tempest_plugin_ironic_git_install_branch }}" repo: "{{ tempest_plugin_magnum_git_repo }}"
install: "{{ tempest_service_available_ironic | bool }}" branch: "{{ tempest_plugin_magnum_git_install_branch }}"
keystone: install: "{{ tempest_service_available_magnum | bool }}"
- name: keystone-tempest-plugin - name: manila-tempest-plugin
repo: "{{ tempest_plugin_keystone_git_repo }}" repo: "{{ tempest_plugin_manila_git_repo }}"
branch: "{{ tempest_plugin_keystone_git_install_branch }}" branch: "{{ tempest_plugin_manila_git_install_branch }}"
install: yes install: "{{ tempest_service_available_manila | bool }}"
magnum: - name: murano-tempest-plugin
- name: magnum-tempest-plugin repo: "{{ tempest_plugin_murano_git_repo }}"
repo: "{{ tempest_plugin_magnum_git_repo }}" branch: "{{ tempest_plugin_murano_git_install_branch }}"
branch: "{{ tempest_plugin_magnum_git_install_branch }}" install: "{{ tempest_service_available_murano | bool }}"
install: "{{ tempest_service_available_magnum | bool }}" - name: neutron-tempest-plugin
manila: repo: "{{ tempest_plugin_neutron_git_repo }}"
- name: manila-tempest-plugin branch: "{{ tempest_plugin_neutron_git_install_branch }}"
repo: "{{ tempest_plugin_manila_git_repo }}" install: "{{ tempest_service_available_neutron or tempest_service_available_neutron_bgpvpn or tempest_service_available_neutron_vpnaas }}"
branch: "{{ tempest_plugin_manila_git_install_branch }}" - name: novajoin-tempest-plugin
install: "{{ tempest_service_available_manila | bool }}" repo: "{{ tempest_plugin_novajoin_git_repo }}"
murano: branch: "{{ tempest_plugin_novajoin_git_install_branch }}"
- name: murano-tempest-plugin install: "{{ tempest_service_available_novajoin | bool }}"
repo: "{{ tempest_plugin_murano_git_repo }}" - name: octavia-tempest-plugin
branch: "{{ tempest_plugin_murano_git_install_branch }}" repo: "{{ tempest_plugin_octavia_git_repo }}"
install: "{{ tempest_service_available_murano | bool }}" branch: "{{ tempest_plugin_octavia_git_install_branch }}"
neutron: install: "{{ tempest_service_available_octavia | bool }}"
- name: neutron-tempest-plugin - name: senlin-tempest-plugin
repo: "{{ tempest_plugin_neutron_git_repo }}" repo: "{{ tempest_plugin_senlin_git_repo }}"
branch: "{{ tempest_plugin_neutron_git_install_branch }}" branch: "{{ tempest_plugin_senlin_git_install_branch }}"
install: "{{ tempest_service_available_neutron or tempest_service_available_neutron_bgpvpn or tempest_service_available_neutron_vpnaas }}" install: "{{ tempest_service_available_senlin | bool }}"
novajoin: - name: sahara-tests
- name: novajoin-tempest-plugin repo: "{{ tempest_plugin_sahara_git_repo }}"
repo: "{{ tempest_plugin_novajoin_git_repo }}" branch: "{{ tempest_plugin_sahara_git_install_branch }}"
branch: "{{ tempest_plugin_novajoin_git_install_branch }}" install: "{{ tempest_service_available_sahara | bool }}"
install: "{{ tempest_service_available_novajoin | bool }}" - name: telemetry-tempest-plugin
octavia: repo: "{{ tempest_plugin_telemetry_git_repo }}"
- name: octavia-tempest-plugin branch: "{{ tempest_plugin_telemetry_git_install_branch }}"
repo: "{{ tempest_plugin_octavia_git_repo }}" install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) or (tempest_service_available_gnocchi | bool) or (tempest_service_available_panko | bool) }}"
branch: "{{ tempest_plugin_octavia_git_install_branch }}" - name: trove-tempest-plugin
install: "{{ tempest_service_available_octavia | bool }}" repo: "{{ tempest_plugin_trove_git_repo }}"
senlin: branch: "{{ tempest_plugin_trove_git_install_branch }}"
- name: senlin-tempest-plugin install: "{{ tempest_service_available_trove | bool }}"
repo: "{{ tempest_plugin_senlin_git_repo }}" - name: zaqar-tempest-plugin
branch: "{{ tempest_plugin_senlin_git_install_branch }}" repo: "{{ tempest_plugin_zaqar_git_repo }}"
install: "{{ tempest_service_available_senlin | bool }}" branch: "{{ tempest_plugin_zaqar_git_install_branch }}"
sahara: install: "{{ tempest_service_available_zaqar | bool }}"
- name: sahara-tests - name: zun-tempest-plugin
repo: "{{ tempest_plugin_sahara_git_repo }}" repo: "{{ tempest_plugin_zun_git_repo }}"
branch: "{{ tempest_plugin_sahara_git_install_branch }}" branch: "{{ tempest_plugin_zun_git_install_branch }}"
install: "{{ tempest_service_available_sahara | bool }}" install: "{{ tempest_service_available_zun | bool }}"
telemetry:
- name: telemetry-tempest-plugin
repo: "{{ tempest_plugin_telemetry_git_repo }}"
branch: "{{ tempest_plugin_telemetry_git_install_branch }}"
install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) or (tempest_service_available_gnocchi | bool) or (tempest_service_available_panko | bool) }}"
trove:
- name: trove-tempest-plugin
repo: "{{ tempest_plugin_trove_git_repo }}"
branch: "{{ tempest_plugin_trove_git_install_branch }}"
install: "{{ tempest_service_available_trove | bool }}"
zaqar:
- name: zaqar-tempest-plugin
repo: "{{ tempest_plugin_zaqar_git_repo }}"
branch: "{{ tempest_plugin_zaqar_git_install_branch }}"
install: "{{ tempest_service_available_zaqar | bool }}"
zun:
- name: zun-tempest-plugin
repo: "{{ tempest_plugin_zun_git_repo }}"
branch: "{{ tempest_plugin_zun_git_install_branch }}"
install: "{{ tempest_service_available_zun | bool }}"