From b374ea33e4c90bb393c062e97737b90fd2bc455c Mon Sep 17 00:00:00 2001
From: ZijianGuo <guozijn@gmail.com>
Date: Tue, 28 May 2019 16:56:25 +0800
Subject: [PATCH] Update service_provider for FWaaS v2

As described in document [1], the service_provider should be set to
'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.
agents.agents.FirewallAgentDriver:default' for FWaaS v2.

[1] https://docs.openstack.org/neutron/stein/admin/fwaas-v2-scenario.html#enable-fwaas-v2

Change-Id: Iad3e906af325ba3209a77a91ab2061e515b4a219
Signed-off-by: ZijianGuo <guozijn@gmail.com>
---
 ansible/roles/neutron/templates/fwaas_driver.ini.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/neutron/templates/fwaas_driver.ini.j2 b/ansible/roles/neutron/templates/fwaas_driver.ini.j2
index 01b4391ead..fb2ee3df04 100644
--- a/ansible/roles/neutron/templates/fwaas_driver.ini.j2
+++ b/ansible/roles/neutron/templates/fwaas_driver.ini.j2
@@ -13,6 +13,10 @@ driver = iptables_v2
 {% endif %}
 
 [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 %}