openstack/neutron-fwaas
Code Issues Proposed changes

Merge "Ensure that LB agent does not terminate if interface already exists in bridge"

Browse Source
This commit is contained in:
Jenkins 2012-08-22 15:06:30 +00:00 committed by Gerrit Code Review
commit 06cdcbacbc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
View File

@ -226,8 +226,13 @@ class LinuxBridge:
# Check if the interface is part of the bridge
if not self.interface_exists_on_bridge(bridge_name, interface):
utils.execute(['brctl', 'addif', bridge_name, interface],
root_helper=self.root_helper)
try:
utils.execute(['brctl', 'addif', bridge_name, interface],
root_helper=self.root_helper)
except Exception as e:
LOG.error("Unable to add %s to %s! Exception: %s", interface,
bridge_name, e)
return
def add_tap_interface(self, network_id, physical_interface, vlan_id,
tap_device_name):