Browse Source

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
tags/14.0.0.0rc1
yatin 4 months ago
parent
commit
feb1f62540

+ 3
- 3
packstack/plugins/neutron_350.py View File

@@ -757,9 +757,9 @@ def create_manifests(config, messages):
757 757
         service_plugins.append('metering')
758 758
 
759 759
     if config['CONFIG_NEUTRON_FWAAS'] == 'y':
760
-        service_plugins.append('firewall')
761
-        fwaas_sp = ('FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.'
762
-                    'OVSHybridIptablesFirewallDriver:default')
760
+        service_plugins.append('firewall_v2')
761
+        fwaas_sp = ('FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.'
762
+                    'service_drivers.agents.agents.FirewallAgentDriver:default')
763 763
         service_providers.append(fwaas_sp)
764 764
 
765 765
     if config['CONFIG_NEUTRON_VPNAAS'] == 'y':

+ 2
- 2
packstack/puppet/modules/packstack/manifests/neutron/fwaas.pp View File

@@ -2,7 +2,7 @@ class packstack::neutron::fwaas ()
2 2
 {
3 3
     class { '::neutron::services::fwaas':
4 4
       enabled => true,
5
-      agent_version => 'v1',
6
-      driver  => 'neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver',
5
+      agent_version => 'v2',
6
+      driver  => 'neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.iptables_fwaas_v2.IptablesFwaasDriver',
7 7
     }
8 8
 }

+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/l3.pp View File

@@ -7,7 +7,7 @@ class packstack::neutron::l3 ()
7 7
 
8 8
     $neutron_fwaas_enabled   = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
9 9
     if $neutron_fwaas_enabled {
10
-      $extensions = 'fwaas'
10
+      $extensions = 'fwaas_v2'
11 11
     } else {
12 12
       $extensions = undef
13 13
     }

Loading…
Cancel
Save