1. devstack
  2. Commit 7f95baa5706980a0910741693abee73abea98b89
Browse code

Fix devstack with linuxbridge without l3 agent

The linuxbridge agent for Neutron expects that the public bridge will
already be created by the time it starts. On devstack, this only occurs
as part of the l3 agent configuration. If a compute node doesn't have an
l3 agent and is using a linuxbridge agent, then br-ex won't be created
and the process will not be able to start (causing stack.sh to fail).

This causes the gate-grenade-dsvm-neutron-linuxbridge-multinode-nv gate
to fail.

Closes-Bug: #1643562
Change-Id: I6f441c6febb5070ad885569d9c798634d0272b6c

John Schwarz authored on 2016/11/21 22:52:36
Showing 1 changed files
lib/neutron_plugins/linuxbridge_agent
History View file @ 7f95baa
... ... 
@@ -62,7 +62,9 @@ function neutron_plugin_configure_plugin_agent {
62 62 
         LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
63 63 
     fi
64 64 
     if [[ "$PUBLIC_BRIDGE" != "" ]] && [[ "$PUBLIC_PHYSICAL_NETWORK" != "" ]]; then
65 
-        iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
65 
+        if is_service_enabled neutron-l3; then
66 
+            iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
67 
+        fi
66 68 
     fi
67 69 
     if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
68 70 
         iniset /$Q_PLUGIN_CONF_FILE linux_bridge physical_interface_mappings $LB_INTERFACE_MAPPINGS