Merge "Refactor infra-cloud-bridge element to support CentOS/RH"

files/elements/infra-cloud-bridge/init-scripts/systemd/create_bridge.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Create bridge for infra cloud
+After=glean@.service network.target network-online.target
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/bin/python /opt/create_bridge.py
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target

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

@@ -17,6 +17,7 @@
 
 import json
 import os
+import platform
 import subprocess
 import sys
 
@@ -24,20 +25,31 @@ from glean import systemlock
 from glean.cmd import get_config_drive_interfaces, get_sys_interfaces
 
 
-def configure_bridge(interface, interface_name, bridge_name, vlan_raw_device=None):
+def configure_bridge_debian(interface, interface_name, bridge_name, vlan_raw_device=None):
     if 'vlan_id' in interface:
         vlan_content = 'vlan-raw-device %s' % vlan_raw_device
     else:
         vlan_content = ''
 
     network_file = '/etc/network/interfaces.d/%s.cfg' % interface_name
+    bridge_file = '/etc/network/interfaces.d/%s.cfg' % bridge_name
 
-    # generate content depending on data
+    # generate interface content depending on data
-    file_content = """
+    interface_file_content = """
 auto {net_name}
 iface {net_name} inet manual
 {vlan_content}
+"""
 
+    interface_file_content = interface_file_content.format(
+        net_name=interface_name,
+        vlan_content=vlan_content)
+
+    with open(network_file, 'w') as target_file:
+        target_file.write(interface_file_content)
+
+    # generate bridge content depending on data
+    bridge_file_content = """
 auto {bridge_name}
 iface {bridge_name} inet static
     bridge_ports {net_name}
@@ -48,19 +60,79 @@ iface {bridge_name} inet static
     netmask {netmask}
     gateway {gateway}
     dns-nameservers {nameservers}
-
 """
 
-    file_content = file_content.format(
+    bridge_file_content = bridge_file_content.format(
-        net_name=interface_name, vlan_content=vlan_content,
+        bridge_name=bridge_name,
+        net_name=inteface_name,
+        ipv4_address=interface['ip_address'],
+        netmask=interface['netmask'],
+        gateway=interface['routes'][0]['gateway'],
+        nameservers=' '.join(interface['dns_nameservers']))
+
+    with open(bridge_file, 'w') as target_file:
+        target_file.write(bridge_file_content)
+
+    # turn down pre-existing interface and start the bridge
+    # because at this point, glean has already configured
+    # previous interface that needs to be overriden.
+    # This will only happen at first time that the bridge
+    # is configured, because on reboots, we won't reach this
+    # configure_bridge method
+    subprocess.call(['ifdown', interface_name])
+    subprocess.call(['ifup', bridge_name])
+
+
+def configure_bridge_rh(interface, interface_name, bridge_name, vlan_raw_device=None):
+    if 'vlan_id' in interface:
+        vlan_content = 'VLAN=YES'
+    else:
+        vlan_content = ''
+
+    network_file = '/etc/sysconfig/network-scripts/ifcfg-%s' % interface_name
+    bridge_file = '/etc/sysconfig/network-scripts/ifcfg-%s' % bridge_name
+
+    # generate interface content depending on data
+    interface_file_content = """
+DEVICE={net_name}
+BOOTPROTO=none
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+{vlan_content}
+BRIDGE={bridge_name}
+"""
+
+    interface_file_content = interface_file_content.format(
+        net_name=interface_name,
+        vlan_content=vlan_content,
+        bridge_name=bridge_name)
+
+    with open(network_file, 'w') as target_file:
+        target_file.write(interface_file_content)
+
+    # generate bridge content depending on data
+    bridge_file_content = """
+DEVICE={bridge_name}
+TYPE=Bridge
+IPADDR={ipv4_address}
+NETMASK={netmask}
+GATEWAY={gateway}
+STP=off
+HELLO=2
+MAXAGE=12
+DNS={nameservers}
+"""
+
+    bridge_file_content = bridge_file_content.format(
         bridge_name=bridge_name,
         ipv4_address=interface['ip_address'],
         netmask=interface['netmask'],
         gateway=interface['routes'][0]['gateway'],
         nameservers=' '.join(interface['dns_nameservers']))
 
-    with open(network_file, 'w') as target_file:
+    with open(bridge_file, 'w') as target_file:
-        target_file.write(file_content)
+        target_file.write(bridge_file_content)
 
     # turn down pre-existing interface and start the bridge
     # because at this point, glean has already configured
@@ -80,9 +152,13 @@ class MockArgs(object):
 def main():
     network_info_file = '/mnt/config/openstack/latest/network_info.json'
 
+    # detect the platform where we are
+    distro = platform.dist()[0].lower()
+
     params = MockArgs()
     setattr(params, 'root', '/')
     setattr(params, 'noop', False)
+    setattr(params, 'distro', distro)
     sys_interfaces = get_sys_interfaces(None, params)
 
     network_info = {}
@@ -116,12 +192,21 @@ def main():
 
         # only configure bridge if not exists
         if not os.path.exists('/sys/class/net/%s' % bridge_name):
-            configure_bridge(interface, interface_name,
+            if distro in ('debian', 'ubuntu'):
+                configure_bridge_debian(interface, interface_name,
+                                        bridge_name, vlan_raw_device)
+            else:
+                configure_bridge_rh(interface, interface_name,
                                     bridge_name, vlan_raw_device)
     else:
         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 distro in ('debian', 'ubuntu'):
+                configure_bridge_debian(interface, interface_name,
+                                        bridge_name)
+            else:
+                configure_bridge_rh(interface, interface_name,
+                                    bridge_name)
 
 if __name__ == '__main__':
     with systemlock.Lock('/tmp/glean.lock'):