summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryatin <ykarel@redhat.com>2019-02-05 12:28:57 +0530
committeryatin <ykarel@redhat.com>2019-02-06 04:13:10 +0000
commitfeb1f625408cd96622fc677fdb28615ccf5d27da (patch)
treeaed8e7380158bcd364a01f78fc9cba35284f18e3
parent5847b42828f1a2a44de032445d63ce855a2780bc (diff)
Switch to supported firewall v2 driver
Firewall v1 driver was deprecated long ago and is now removed in [1], let's switch to firewall v2 driver. [1] https://review.openstack.org/#/c/616410/ Change-Id: Ic995a392075133dd1fba9e417e07149dc1cb4863
Notes
Notes (review): Code-Review+2: Javier Peña <jpena@redhat.com> Code-Review+2: Alfredo Moralejo <amoralej@redhat.com> Workflow+1: Alfredo Moralejo <amoralej@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 06 Feb 2019 17:47:42 +0000 Reviewed-on: https://review.openstack.org/634863 Project: openstack/packstack Branch: refs/heads/master
-rw-r--r--packstack/plugins/neutron_350.py6
-rw-r--r--packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp4
-rw-r--r--packstack/puppet/modules/packstack/manifests/neutron/l3.pp2
3 files changed, 6 insertions, 6 deletions
diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index 237aae1..6a875f9 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -757,9 +757,9 @@ def create_manifests(config, messages):
757 service_plugins.append('metering') 757 service_plugins.append('metering')
758 758
759 if config['CONFIG_NEUTRON_FWAAS'] == 'y': 759 if config['CONFIG_NEUTRON_FWAAS'] == 'y':
760 service_plugins.append('firewall') 760 service_plugins.append('firewall_v2')
761 fwaas_sp = ('FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.' 761 fwaas_sp = ('FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.'
762 'OVSHybridIptablesFirewallDriver:default') 762 'service_drivers.agents.agents.FirewallAgentDriver:default')
763 service_providers.append(fwaas_sp) 763 service_providers.append(fwaas_sp)
764 764
765 if config['CONFIG_NEUTRON_VPNAAS'] == 'y': 765 if config['CONFIG_NEUTRON_VPNAAS'] == 'y':
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp b/packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp
index 6435d2e..b3813d9 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp
@@ -2,7 +2,7 @@ class packstack::neutron::fwaas ()
2{ 2{
3 class { '::neutron::services::fwaas': 3 class { '::neutron::services::fwaas':
4 enabled => true, 4 enabled => true,
5 agent_version => 'v1', 5 agent_version => 'v2',
6 driver => 'neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver', 6 driver => 'neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.iptables_fwaas_v2.IptablesFwaasDriver',
7 } 7 }
8} 8}
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/l3.pp b/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
index b6b8574..e1c40b0 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
@@ -7,7 +7,7 @@ class packstack::neutron::l3 ()
7 7
8 $neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS')) 8 $neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
9 if $neutron_fwaas_enabled { 9 if $neutron_fwaas_enabled {
10 $extensions = 'fwaas' 10 $extensions = 'fwaas_v2'
11 } else { 11 } else {
12 $extensions = undef 12 $extensions = undef
13 } 13 }