Support the "ks" parameter for Fedora kickstart-based autoinstalls.

[invirt/packages/invirt-remote.git] / server / usr / sbin / invirt-remote-create

diff --git a/server/usr/sbin/invirt-remote-create b/server/usr/sbin/invirt-remote-create
index 9f5817a..47939e9 100755 (executable)
--- a/server/usr/sbin/invirt-remote-create
+++ b/server/usr/sbin/invirt-remote-create
@@ -18,7 +18,7 @@ def maxMemory(owner, xmlist):
     """
     Return the memory available for a new machine.
     """
     """
     Return the memory available for a new machine.
     """

-    machines = invirt.database.Machine.query().filter_by(owner=owner)
+    machines = invirt.database.Machine.query.filter_by(owner=owner)

     (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner)
 
     active_machines = [m for m in machines if m.name in xmlist]
     (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner)
 
     active_machines = [m for m in machines if m.name in xmlist]

@@ -42,7 +42,7 @@ def main(argv):
 
     if operation == 'install':
         options = dict(arg.split('=', 1) for arg in args)
 
     if operation == 'install':
         options = dict(arg.split('=', 1) for arg in args)

-        valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall', 'preseed'))
+        valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall', 'ks', 'preseed'))

         if not set(options.keys()).issubset(valid_keys):
             print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
             return 1
         if not set(options.keys()).issubset(valid_keys):
             print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
             return 1

@@ -64,7 +64,7 @@ def main(argv):
         return 1
 
     if operation == "create":
         return 1
 
     if operation == "create":

-        machine = invirt.database.Machine.query().filter_by(name=machine_name).first()
+        machine = invirt.database.Machine.query.filter_by(name=machine_name).first()

 
         owner = machine.owner
         vm_memory = machine.memory
 
         owner = machine.owner
         vm_memory = machine.memory