removed unedded command list, for sake of simplicity

1 files changed, 17 insertions, 27 deletions

diff --git a/mountDiskSetupVserver.py b/mountDiskSetupVserver.py
index c94cbfc..b7b3fde 100755
--- a/mountDiskSetupVserver.py
+++ b/mountDiskSetupVserver.py
@@ -28,34 +28,24 @@ elif len(args) > 2:
 
 vmName = parseVmName(args[0])
 ip, ipLastBlock = parseIp(args[1])
-iscsiLunId = 'iqn.' + iscsiDate + '.de.spline:' + vmName
+iscsiLunId = 'iqn.' + iscsiDate + '.de.spline:'
 vmConfigDir = '/etc/vservers/' + vmName
 
-cmds = [
-    [ 'iscsiadm', '-m', 'discovery', '-t', 'st', '-p', iscsiTargetIp ],
-# maybe i schould grep if, the device was in the output
-#       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],
-    [   'vserver', vmName, 'build',
-        '-m', 'template',
-        '--interface', 'eth0:' + ip + '/25',
-        '--initstyle', 'sysv',
-        '--context', str(ipLastBlock),
-        '--hostname', vmName,
-        '--',
-        '--template', defaultImage,
-        '-d', 'debian' ],
-    [ 'umount', '/vservers/' + vmName ],
-    [ 'vserver', vmName, 'start' ]
-]
-
 exe = Executor([
-    ExecRecepie('discover iscsi luns', cmds[0]),
-    ExecRecepie('log in to iscsi lun ' + iscsiTargetIp, cmds[1]),
-    ExecRecepie('create vserver folder', cmds[2]),
-    ExecRecepie('create vserver ( this may take some time)', cmds[3]),
+    ExecRecepie('create vserver folder',
+        [ 'mkdir', '/vservers/' + vmName ]),
+    ExecRecepie('mount vserver directory',
+        [ 'mount', '/dev/disk/by-label/' + vmName, '/vservers/' + vmName]),
+    ExecRecepie('create vserver ( this may take some time)',
+        [   'vserver', vmName, 'build',
+            '-m', 'template',
+            '--interface', 'eth0:' + ip + '/25',
+            '--initstyle', 'sysv',
+            '--context', str(ipLastBlock),
+            '--hostname', vmName,
+            '--',
+            '--template', defaultImage,
+            '-d', 'debian' ]),
 
     # iscsi meta-daten im vserver-etc verzeichnis hinzufuegen
     ConfigRecepie('configure iscsi lun for vm',
@@ -79,8 +69,8 @@ exe = Executor([
         vmConfigDir  + '/apps/init',
         { 'mark' : 'pang\ndebian\nauto-update\n'}),
 
-    ExecRecepie('umount disk', cmds[4]),
-    ExecRecepie('start vserver', cmds[5])
+    ExecRecepie('umount disk', [ 'umount', '/vservers/' + vmName ]),
+    ExecRecepie('start vserver', [ 'vserver', vmName, 'start' ])
 ])
 
 exe.do()