openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove external_network_bridge option

Browse Source 
The external_network_bridge parameter is deprecated and
will be removed in Ocata.

Change-Id: Ifd9fd2393ceb9b0d1a4b83a9954d581a43bdb0d4
This commit is contained in:
ZhongShengping 2017-01-21 19:55:28 +08:00
parent c88e310e11
commit 9f4638b0bb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/neutron.pp
View File

@ -82,7 +82,6 @@ class openstack_integration::neutron (
tunnel_types => ['vxlan'], tunnel_types => ['vxlan'],
physical_interface_mappings => ['external:loop0'], physical_interface_mappings => ['external:loop0'],
} }
$external_network_bridge = ''
$firewall_driver = 'iptables' $firewall_driver = 'iptables'
} }
default: { default: {
@ -152,12 +151,9 @@ class openstack_integration::neutron (
debug => true, debug => true,
} }
class { '::neutron::agents::l3': class { '::neutron::agents::l3':
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,
extensions => 'fwaas', extensions => 'fwaas',
# This parameter is deprecated but we need it for linuxbridge
# It will be dropped in a future release.
external_network_bridge => $external_network_bridge,
} }
class { '::neutron::agents::dhcp': class { '::neutron::agents::dhcp':
interface_driver => $driver, interface_driver => $driver,