Don't quote the basic variables, apparently things like udev don't parse quotes.

[pyplnet.git] / plnet.py

diff --git a/plnet.py b/plnet.py
index 272fa00..1410a0e 100755 (executable)
--- a/plnet.py
+++ b/plnet.py
@@ -5,12 +5,18 @@ import os
 import socket
 import time
 import tempfile
+import errno
 
 import sioc
 import modprobe
 
-def InitInterfaces(logger, plc, data, root="", files_only=False):
+def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
     sysconfig = "%s/etc/sysconfig/network-scripts" % root
+    try:
+        os.makedirs(sysconfig)
+    except OSError, e:
+        if e.errno != errno.EEXIST:
+            raise e
 
     # query running network interfaces
     devs = sioc.gifconf()
@@ -23,6 +29,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
     interfaces = {}
     interface = 1
     hostname = data.get('hostname',socket.gethostname())
+    gateway = None
     networks = data['networks']
     failedToGetSettings = False
     for network in networks:
@@ -48,14 +55,19 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
         inter['USERCTL']='no'
         if network['mac']:
             inter['HWADDR'] = network['mac']
+        if network['is_primary']:
+            inter['PRIMARY']='yes'
 
         if network['method'] == "static":
             inter['BOOTPROTO'] = "static"
             inter['IPADDR'] = network['ip']
             inter['NETMASK'] = network['netmask']
+            if network['is_primary']:
+                gateway = network['gateway']
 
         elif network['method'] == "dhcp":
             inter['BOOTPROTO'] = "dhcp"
+            inter['PERSISTENT_DHCLIENT'] = "yes"
             if network['hostname']:
                 inter['DHCP_HOSTNAME'] = network['hostname']
             else:
@@ -126,7 +138,10 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
             interfaces[ifname] = inter
                 
     m = modprobe.Modprobe()
-    m.input("%s/etc/modprobe.conf" % root)
+    try:
+        m.input("%s/etc/modprobe.conf" % root, program)
+    except:
+        pass
     for (dev, inter) in interfaces.iteritems():
         # get the driver string "moduleName option1=a option2=b"
         driver=inter.get('DRIVER','')
@@ -177,20 +192,27 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
     if deletedSomething:
         time.sleep(2)
 
-    # Process ifcg-$dev changes / additions
+    # Write network configuration file
+    networkconf = file("%s/etc/sysconfig/network" % root, "w")
+    networkconf.write("NETWORKING=yes\nHOSTNAME=%s\n" % hostname)
+    if gateway is not None:
+        networkconf.write("GATEWAY=%s\n" % gateway)
+    networkconf.close()
+
+    # Process ifcfg-$dev changes / additions
     newdevs = []
     for (dev, inter) in interfaces.iteritems():
         (fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
         f = os.fdopen(fd, "w")
-        f.write("# Autogenerated by NodeManager/net.py.... do not edit!\n")
+        f.write("# Autogenerated by pyplnet... do not edit!\n")
         if 'DRIVER' in inter:
             f.write("# using %s driver for device %s\n" % (inter['DRIVER'],dev))
-        f.write('DEVICE="%s"\n' % dev)
+        f.write('DEVICE=%s\n' % dev)
         
         # print the configuration values
         for (key, val) in inter.iteritems():
             if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'):
-                f.write('%s="%s"\n' % (key, val))
+                f.write('%s=%s\n' % (key, val))
 
         # print the configuration specific option values (if any)
         if 'CFGOPTIONS' in inter:
@@ -286,16 +308,18 @@ if __name__ == "__main__":
     import optparse
     import sys
 
-    parser = optparse.OptionParser()
+    parser = optparse.OptionParser(usage="plnet [-v] [-f] [-p <program>] -r root node_id")
     parser.add_option("-v", "--verbose", action="store_true", dest="verbose")
     parser.add_option("-r", "--root", action="store", type="string",
                       dest="root", default=None)
     parser.add_option("-f", "--files-only", action="store_true",
                       dest="files_only")
+    parser.add_option("-p", "--program", action="store", type="string",
+                      dest="program", default="plnet")
     (options, args) = parser.parse_args()
     if len(args) != 1 or options.root is None:
-        print >>sys.stderr, \
-            "Usage: %s [-v] [-f] -r <root> node_id" % sys.argv[0]
+        print >>sys.stderr, "Missing root or node_id"
+        parser.print_help()
         sys.exit(1)
 
     node = shell.GetNodes({'node_id': [int(args[0])]})