opendev
/
puppet-infracloud
Code Issues Proposed changes

Merge "Fix bridge creation in no vlan use case"

This commit is contained in:
Jenkins 2016-08-22 09:55:24 +00:00 committed by Gerrit Code Review
parent 5b4f484d61 d1aa222895
commit 6bf9a3c29e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/elements/infra-cloud-bridge/static/opt/create_bridge.py
View File

@ -112,18 +112,16 @@ def main():
interface_name = "{0}.{1}".format(
vlan_raw_device, interface['vlan_id'])
# generate bridge name
if 'vlan_id' in interface:
bridge_name = 'br-vlan%s' % interface['vlan_id']
# only configure bridge if not exists
if not os.path.exists('/sys/class/net/%s' % bridge_name):
configure_bridge(interface, interface_name,
'br-vlan%s' % interface['vlan_id'],
vlan_raw_device)
bridge_name, vlan_raw_device)
else:
configure_bridge(interface, interface_name,
'br-%s' % interface_name)
bridge_name = 'br-%s' % interface_name
if not os.path.exists('/sys/class/net/%s' % bridge_name):
configure_bridge(interface, interface_name, bridge_name)
if __name__ == '__main__':
with systemlock.Lock('/tmp/glean.lock'):