Browse code

Merge "Configure bridge_mappings for ovs and linuxbridge agents"

Jenkins authored on 2017/09/23 10:10:30
Showing 1 changed files
... ...
@@ -229,6 +229,13 @@ function configure_neutron_new {
229 229
         configure_root_helper_options $NEUTRON_L3_CONF
230 230
         iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
231 231
         neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
232
+
233
+        # Configure the neutron agent to serve external network ports
234
+        if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
235
+            iniset $NEUTRON_CORE_PLUGIN_CONF linux_bridge bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
236
+        else
237
+            iniset $NEUTRON_CORE_PLUGIN_CONF ovs bridge_mappings "$PUBLIC_NETWORK_NAME:$PUBLIC_BRIDGE"
238
+        fi
232 239
     fi
233 240
 
234 241
     # Metadata