From 9f4638b0bbac79fc4d9e62c8399c4ead4cbe9884 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sat, 21 Jan 2017 19:55:28 +0800
Subject: [PATCH] Remove external_network_bridge option

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

Change-Id: Ifd9fd2393ceb9b0d1a4b83a9954d581a43bdb0d4
---
 manifests/neutron.pp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index dd6c46ab2..bfa7e2c34 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -82,7 +82,6 @@ class openstack_integration::neutron (
         tunnel_types                => ['vxlan'],
         physical_interface_mappings => ['external:loop0'],
       }
-      $external_network_bridge = ''
       $firewall_driver         = 'iptables'
     }
     default: {
@@ -152,12 +151,9 @@ class openstack_integration::neutron (
     debug            => true,
   }
   class { '::neutron::agents::l3':
-    interface_driver        => $driver,
-    debug                   => true,
-    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,
+    interface_driver => $driver,
+    debug            => true,
+    extensions       => 'fwaas',
   }
   class { '::neutron::agents::dhcp':
     interface_driver => $driver,