From 85a5fb55c4e8ec75987db2d7745439604c0301a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 8 Aug 2019 20:26:57 +0200 Subject: [PATCH] Fix FWaaS service provider (v2, Stein issue) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because we merged both [1] and [2] in master, we got broken FWaaS. This patch unbreaks it and is required to backport to Stein due to [2] backport waiting for merge, while [1] is already backported. [1] https://review.opendev.org/661704 [2] https://review.opendev.org/668406 Change-Id: I74427ce9b937c42393d86574614603bd788606af Signed-off-by: Radosław Piliszek --- ansible/roles/neutron/templates/fwaas_driver.ini.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/roles/neutron/templates/fwaas_driver.ini.j2 b/ansible/roles/neutron/templates/fwaas_driver.ini.j2 index 1841f0479a..2432f7d850 100644 --- a/ansible/roles/neutron/templates/fwaas_driver.ini.j2 +++ b/ansible/roles/neutron/templates/fwaas_driver.ini.j2 @@ -8,10 +8,6 @@ agent_version = v2 driver = iptables_v2 [service_providers] -{% if neutron_fwaas_version == 'v1' %} -service_provider = FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default -{% elif neutron_fwaas_version == 'v2' %} service_provider = FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default {% endif %} {% endif %} -{% endif %}