X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=8ce9428572bb7ab0f2881b454ae08c2a7300d6fd;hb=7a94db1a3942cc7232bf782bcab86ca83f60d0c3;hp=0f692f4670f9ed0d2e98f54cd6b169b7331a6925;hpb=84ebca39ef841949d78ce4266673aa590801b200;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index 0f692f4..8ce9428 100755
--- a/plnet.py
+++ b/plnet.py
@@ -59,6 +59,9 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
     interfaces.sort( compare_by('is_primary') )
     interfaces.reverse()
 
+    # The names of the bridge devices
+    bridgeDevices = []
+
     for interface in interfaces:
         logger.verbose('net:InitInterfaces interface %d: %r'%(device_id,interface))
         logger.verbose('net:InitInterfaces macs = %r' % macs)
@@ -79,6 +82,9 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
 
         details = prepDetails(interface, hostname)
 
+        if interface['is_primary']:
+            gateway = interface['gateway']
+
         if 'interface_tag_ids' in interface:
             version = 4.3
             interface_tag_ids = "interface_tag_ids"
@@ -149,20 +155,17 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
             else:
                 logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS'])
             device_id -= 1
-        elif 'BRIDGE' in details:
-            #The bridge inherits the mac of the first attached interface.
-            if 'IFNAME' in details:
-                ifname = details['IFNAME']
-                device_id -= 1
-            elif orig_ifname:
-                ifname = orig_ifname
-                device_id -= 1
+        elif 'BRIDGE' in details and 'IFNAME' in details:
+            # The bridge inherits the mac of the first attached interface.
+            ifname = details['IFNAME']
+            device_id -= 1
             logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname)
             devices_map[ifname] = removeBridgedIfaceDetails(details)
             bridgeName = details['BRIDGE']
 
             logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName)
             bridgeDetails = prepDetails(interface)
+            bridgeDevices.append(bridgeName)
             bridgeDetails['TYPE']   = 'Bridge'
             devices_map[bridgeName] = bridgeDetails
         else:
@@ -381,10 +384,19 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         # handle those correctly
         if getvar("SLAVE") == 'yes': continue
 
+        # Delay bringing up any bridge devices
+        if dev in bridgeDevices: continue
+
         if not files_only:
             logger.verbose('net:InitInterfaces bringing up %s' % dev)
             os.system("/sbin/ifup %s" % dev)
 
+    # Bring up the bridge devices
+    for bridge in bridgeDevices:
+        if not files_only and bridge in newdevs:
+            logger.verbose('net:InitInterfaces bringing up bridge %s' % bridge)
+            os.system("/sbin/ifup %s" % bridge)
+
 ##
 # Prepare the interface details.
 #
@@ -403,7 +415,6 @@ def prepDetails(interface, hostname=''):
         details['NETMASK']   = interface['netmask']
         details['GATEWAY']   = interface['gateway']
         if interface['is_primary']:
-            gateway = interface['gateway']
             if interface['dns1']:
                 details['DNS1'] = interface['dns1']
             if interface['dns2']:
@@ -444,8 +455,6 @@ if __name__ == "__main__":
     parser.add_option("-p", "--program", action="store", type="string",
                       dest="program", default="plnet")
     (options, args) = parser.parse_args()
-    options.root = ''
-    options.verbose = True
     if len(args) != 1 or options.root is None:
         print sys.argv
         print >>sys.stderr, "Missing root or node_id"