From: Sean M. Collins <sean@coreitpro.com>
Date: Tue, 30 Jun 2015 16:06:07 +0000 (-0400)
Subject: Remove bridge cleanup call
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8dd8a7d93564168b98fa2350eedf56acede42b0f;p=openstack-build%2Fneutron-build.git

Remove bridge cleanup call

Remove the bridge cleanup call to delete bridges, since we are seeing
race conditions where bridges are deleted, then new interfaces are
created and are attempting to plug into the bridge before it is
recreated.

Change-Id: I4ccc96566a5770384eacbbdc492bf09a514f5b31
Related-Bug: #1328546
---

diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 66be308a2..1e21db74c 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -948,7 +948,6 @@ class LinuxBridgeNeutronAgentRPC(service.Service):
                 LOG.info(_LI("Port %s updated."), device)
             else:
                 LOG.debug("Device %s not defined on plugin", device)
-            self.br_mgr.remove_empty_bridges()
         return resync
 
     def scan_devices(self, previous, sync):