From e3915938f35737fc231ab7b8b9981dae9048438e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 24 Feb 2017 06:24:47 +0000 Subject: [PATCH] Configure bridge_mappings for ovs and linuxbridge agents Otherwise neutron will fail to bind external ports because of missing entries for external physical network in the mapping. Configure it only when l3 agent is also installed on the node (otherwise the l2 agent is not exposed to external network and hence doesn't have the bridge). Change-Id: I561b74538acb0dc39f1af3e832108ce6a99441b0 --- lib/neutron | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/neutron b/lib/neutron index f277062b32..6da1705525 100644 --- a/lib/neutron +++ b/lib/neutron @@ -211,6 +211,13 @@ function configure_neutron_new { iniset $NEUTRON_L3_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD" 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