X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mclu_import.py;h=52ef16109bd3bc17ad5b29e6dbff96eb6c9abe05;hb=2a55aedad2ca66ede45f62ca0b55b7e6dddc736f;hp=f808182c6a0723f152daa43775edb706cc217aa8;hpb=290cf66cb7a5a6568bd090431793a2639ef4c4b9;p=mclu.git

diff --git a/mclu_import.py b/mclu_import.py
index f808182..52ef161 100644
--- a/mclu_import.py
+++ b/mclu_import.py
@@ -53,26 +53,19 @@ def cmdline (subparsers):
     )
     p.set_defaults (run=run)
 
-def run (c, args, nodes):
+def run (c, args):
     # Did the user request a particular node?  If not, we'll run it
     # on any node which is up.
     m = re.match (r'^(.*):(.*)$', args.name)
     if m:
         node_name = m.group (1)
         vm_name = m.group (2)
-        if node_name in nodes:
-            node = nodes[node_name]
-            if not node.ping ():
-                sys.exit ("error: requested node (%s) is not up, use mclu on %s" %
-                          (node_name, node_name))
-        else:
-            sys.exit ("error: requested node (%s) does not exist" % node_name)
     else:
-        node = lib.pick_any_node_which_is_up (nodes)
+        node = lib.pick_any_node_which_is_up (c)
         vm_name = args.name
 
     # Get all the guests, so we can tell if the name is a duplicate.
-    running, inactive = lib.get_all_guests (c, nodes.values ())
+    running, inactive = lib.get_all_guests (c)
 
     if vm_name in running or vm_name in inactive:
         sys.exit ("error: node name (%s) already exists" % vm_name)
@@ -106,5 +99,5 @@ def run (c, args, nodes):
     fp.close ()
 
     # Start the guest.
-    lib.start_guest (c, node, vm_name)
-    print "guest imported and started on node %s" % node.name
+    lib.start_guest (c, node_name, vm_name)
+    print "guest imported and started on node %s" % node_name