From ce593d8252e871e62181e0f7eaaca982e8e19707 Mon Sep 17 00:00:00 2001 From: Andrew Bonney Date: Fri, 20 Nov 2020 13:38:47 +0000 Subject: [PATCH] Update variables for default Zun deployments and AIO The Zun API added the ability to delete networks in this microversion which means that tempest tests can be run without the need to bind the Docker daemon to a wider set of addresses than localhost. For the same reason, one tempest test is skipped as this assumes the Docker daemon is accessible on localhost. This commit also enables the Zun Horizon UI when Zun is used Change-Id: Ie41c08f3e8c8c06a8bd334f7d8ec9bf03586ec2b --- inventory/group_vars/horizon_all.yml | 1 + .../bootstrap-host/templates/user_variables_zun.yml.j2 | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all.yml index 1f82a18922..c635514956 100644 --- a/inventory/group_vars/horizon_all.yml +++ b/inventory/group_vars/horizon_all.yml @@ -30,6 +30,7 @@ horizon_enable_octavia_ui: "{{ (groups['octavia-infra_all'] is defined) and (gro horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and (neutron_plugin_base | intersect(['firewall', 'firewall_v2']) | length > 0) }}" horizon_enable_neutron_vpnaas: "{{ neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base }}" horizon_enable_senlin_ui: "{{ (groups['senlin_all'] is defined) and (groups['senlin_all'] | length > 0) }}" +horizon_enable_zun_ui: "{{ (groups['zun_all'] is defined) and (groups['zun_all'] | length > 0) }}" horizon_enable_ha_router: "{{ neutron_plugin_type.split('.')[0] == 'ml2' and (groups['neutron_l3_agent'] | length >= 2) }}" # Ensure that the package state matches the global setting diff --git a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 index f00b5383f1..7cc89ac086 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2 @@ -16,6 +16,10 @@ tempest_test_whitelist: - zun_tempest_plugin.tests.tempest.api +tempest_test_blacklist: + - test: zun_tempest_plugin.tests.tempest.api.test_containers.TestContainer.test_run_container_with_image_driver_glance + reason: This test requires direct access to the Docker daemon API on localhost + tempest_tempest_conf_overrides: container_service: - min_microversion: 1.12 + min_microversion: 1.27