commit a030696f6cf16d8adbbb0a20b43a0b856faafd07
author Jenkins <jenkins@review.openstack.org> Wed Nov 30 14:34:29 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 30 14:34:29 2016 +0000
tree 3a0e1040b91d22fc392e4a94eb4d907956b92bc7
parent 9a69a1abfc05a0aab72185347a82d75576476a93
parent 6653d74fc4cbff1b06888fe53a0712117e2394dc

Merge "Revert "Fix devstack with linuxbridge without l3 agent""

lib/neutron_plugins/linuxbridge_agent

diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent
index 194981e..d0de2f5 100644
--- a/lib/neutron_plugins/linuxbridge_agent
+++ b/lib/neutron_plugins/linuxbridge_agent
@@ -62,9 +62,7 @@
         LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
     fi
     if [[ "$PUBLIC_BRIDGE" != "" ]] && [[ "$PUBLIC_PHYSICAL_NETWORK" != "" ]]; then
-        if is_service_enabled neutron-l3; then
-            iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
-        fi
+        iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
     fi
     if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
         iniset /$Q_PLUGIN_CONF_FILE linux_bridge physical_interface_mappings $LB_INTERFACE_MAPPINGS