openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Set firewall_driver for ml2 agents"

Browse Source
This commit is contained in:
Zuul 2020-07-31 01:27:56 +00:00 committed by Gerrit Code Review
commit 2eedf67d59
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/neutron.pp
View File

@ -84,8 +84,8 @@ class openstack_integration::neutron (
tunnel_types => ['vxlan'], tunnel_types => ['vxlan'],
bridge_mappings => ['external:br-ex'], bridge_mappings => ['external:br-ex'],
manage_vswitch => false, manage_vswitch => false,
firewall_driver => 'iptables_hybrid',
} }
$firewall_driver = 'iptables_hybrid'
} }
'linuxbridge': { 'linuxbridge': {
exec { 'create_dummy_iface': exec { 'create_dummy_iface':
@ -98,8 +98,8 @@ class openstack_integration::neutron (
local_ip => $::ipaddress, local_ip => $::ipaddress,
tunnel_types => ['vxlan'], tunnel_types => ['vxlan'],
physical_interface_mappings => ['external:loop0'], physical_interface_mappings => ['external:loop0'],
firewall_driver => 'iptables',
} }
$firewall_driver = 'iptables'
} }
default: { default: {
fail("Unsupported neutron driver (${driver})") fail("Unsupported neutron driver (${driver})")
@ -214,7 +214,6 @@ class openstack_integration::neutron (
tenant_network_types => ['vxlan', 'vlan', 'flat'], tenant_network_types => ['vxlan', 'vlan', 'flat'],
extension_drivers => 'port_security,qos', extension_drivers => 'port_security,qos',
mechanism_drivers => $driver, mechanism_drivers => $driver,
firewall_driver => $firewall_driver,
} }
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {