commit a08503ab4cbba229e9f89efb55c03f720477f3ba
author Jenkins <jenkins@review.openstack.org> Sat Sep 23 01:10:30 2017 +0000
committer Gerrit Code Review <review@openstack.org> Sat Sep 23 01:10:30 2017 +0000
tree ecc1addeb0612b8a0a6bc90639f8b65879f39e72
parent 672ac22ab32e3d00c889603d78c6bb43d601b179
parent e3915938f35737fc231ab7b8b9981dae9048438e

Merge "Configure bridge_mappings for ovs and linuxbridge agents"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 645d68c..21c8d4c 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -229,6 +229,13 @@
         configure_root_helper_options $NEUTRON_L3_CONF
         iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
         neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
+
+        # Configure the neutron agent to serve external network ports
+        if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
+            iniset $NEUTRON_CORE_PLUGIN_CONF linux_bridge bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
+        else
+            iniset $NEUTRON_CORE_PLUGIN_CONF ovs bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
+        fi
     fi
 
     # Metadata