Merge "Ensure that LB agent does not terminate if interface already exists in bridge"
This commit is contained in:
commit
06cdcbacbc
@ -226,8 +226,13 @@ class LinuxBridge:
|
|||||||
|
|
||||||
# Check if the interface is part of the bridge
|
# Check if the interface is part of the bridge
|
||||||
if not self.interface_exists_on_bridge(bridge_name, interface):
|
if not self.interface_exists_on_bridge(bridge_name, interface):
|
||||||
utils.execute(['brctl', 'addif', bridge_name, interface],
|
try:
|
||||||
root_helper=self.root_helper)
|
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,
|
def add_tap_interface(self, network_id, physical_interface, vlan_id,
|
||||||
tap_device_name):
|
tap_device_name):
|
||||||
|
Loading…
Reference in New Issue
Block a user