From c1c61b52e40998b93ca944dbf8ded1e3a6d45db5 Mon Sep 17 00:00:00 2001
From: yves <steve.harrison@gmx.net>
Date: Fri, 30 Dec 2011 00:42:17 +0100
Subject: minor fixes

---
 mountDiskSetupVserver.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/mountDiskSetupVserver.py b/mountDiskSetupVserver.py
index 900af07..2d28fb5 100755
--- a/mountDiskSetupVserver.py
+++ b/mountDiskSetupVserver.py
@@ -11,19 +11,17 @@ defaultImage='/root/vserver-template-v2.tar.bz2'
 # configure known options
 usage = "usage: %prog VMNAME IP [options]"
 parser = optparse.OptionParser(usage=usage)
-parser.add_option("-s", "--size", dest="size", default=defaultDiskSize,
-                    help="SIZE of vm root disk", metavar="SIZE")
 parser.add_option("-v", "--verbose", dest="verbose",
                     action="store_true",  default=False,
                     help="should I do output")
 (options, args) = parser.parse_args()
 
 # check if required args are given
-if len(args) < 1:
+if len(args) < 2:
     parser.print_usage()
-    logErr("a vm-name must be given!")
+    logErr("a vm-name and ip must be given!")
     sys.exit(2)
-elif len(args) > 1:
+elif len(args) > 2:
     parser.print_usage()
     logErr("to many arguments given!")
     sys.exit(2)
@@ -33,7 +31,7 @@ ip, ipLastBlock = parseIp(args[1])
 iscsiLunId = 'iqn.' + iscsiDate + '.de.spline:' + vmName
 vmConfigDir = '/tmp/etc/vservers/' + vmName
 
-pl = ProgressLogger(9)
+pl = ProgressLogger(10)
 
 lf = openLogFile(sys.argv[0] + "-" + vmName)
 
@@ -43,12 +41,12 @@ cmds = [
 #       10.0.0.1:3260,1 iqn.2011-04.de.spline:<name>
     [ 'iscsiadm', '-m', 'node', '-T', iscsiLunId, iscsiTargetIp, '--login' ],
     [ 'mkdir', '/vservers/' + vmName ],
-    [ 'mount', '/dev/disk/by-label/' + vmName, '/vservers/' + vmName +],
+    [ 'mount', '/dev/disk/by-label/' + vmName, '/vservers/' + vmName],
     [   'vserver', vmName, 'build',
         '-m', 'template',
         '--interface', 'eth0:' + ip + '/25',
         '--initstyle', 'sysv',
-        '--context', str(ipLastBlock)
+        '--context', str(ipLastBlock),
         '--hostname', vmName,
         '--',
         '--template', defaultImage,
@@ -75,17 +73,16 @@ pl.done()
 
 def writeFile(path,content):
     try:
-        fd = os.open(path)
-        os.write(fd,content)
-        os.close(fd)
+        fd = open(path,'w')
+        fd.write(content)
+        fd.close()
     except IOError:
         logError('Unable to write file: ' + path)
         sys.exit(2)
 
-
 pl.start('configure iscsi lun for vm')
 # iscsi meta-daten im vserver-etc verzeichnis hinzufuegen
-os.mkdir(vmConfigDir  + '/iscsi/')
+os.mkdir(vmConfigDir  + '/iscsi')
 writeFile(vmConfigDir + '/iscsi/portal',iscsiTargetIp + '\n')
 writeFile(vmConfigDir + '/iscsi/target',iscsiLunId + '\n')
 pl.done()
@@ -93,8 +90,8 @@ pl.done()
 pl.start('configure fstab')
 # die dem vserver zugehörige disk erstmal unmounten und dann in die fstab des vservers einfuegen, damit
 # sie beim starten benutzt wird
-with open(vmConfigDir  + '/fstab', 'rw') as fstab:
-    fstab.writelines(['/dev/disk/by-label/ ' + vmName + '    /         ext4    defaults,relatime   0  1'] + fstab.readlines())
+with open(vmConfigDir  + '/fstab', 'a') as fstab:
+    fstab.write('/dev/disk/by-label/ ' + vmName + '    /         ext4    defaults,relatime   0  1\n')
     fstab.close()
 pl.done()
 
-- 
cgit v1.2.3-1-g7c22