Add AUTOSTART to kvm and libvirt write extensions

If AUTOSTART is 'yes' then the VM will be started once it is
created. If it is 'no' or undefined, then it will need to be manually
started.  If it is any other value, then an exception is raised.

2 files changed, 17 insertions, 11 deletions

diff --git a/kvm.write b/kvm.write
index 630f6ae7..e2f7435c 100755
--- a/kvm.write
+++ b/kvm.write
@@ -56,6 +56,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         
         temp_root, location = args
         ssh_host, vm_name, vm_path = self.parse_location(location)
+        autostart = self.parse_autostart()
         
         fd, raw_disk = tempfile.mkstemp()
         os.close(fd)
@@ -63,7 +64,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         
         try:
             self.transfer(raw_disk, ssh_host, vm_path)
-            self.create_libvirt_guest(ssh_host, vm_name, vm_path)
+            self.create_libvirt_guest(ssh_host, vm_name, vm_path, autostart)
         except BaseException:
             sys.stderr.write('Error deploying to libvirt')
             os.remove(raw_disk)
@@ -95,7 +96,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         with open(raw_disk, 'rb') as f:
             cliapp.runcmd(['rsync', '-zS', raw_disk, target])
 
-    def create_libvirt_guest(self, ssh_host, vm_name, vm_path):
+    def create_libvirt_guest(self, ssh_host, vm_name, vm_path, autostart):
         '''Create the libvirt virtual machine.'''
         
         self.status(msg='Creating libvirt/kvm virtual machine')
@@ -107,13 +108,13 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
 
         ram_mebibytes = str(self.get_ram_size() / (1024**2))
 
-        cliapp.runcmd(
-            ['ssh', ssh_host, 
-             'virt-install', '--connect qemu:///system', '--import',
-             '--name', vm_name, '--vnc', '--noreboot',
-             '--ram=%s' % ram_mebibytes,
-             '--disk path=%s,bus=ide' % vm_path] + 
-            attach_opts)
+        cmdline = ['ssh', ssh_host, 
+                   'virt-install', '--connect qemu:///system', '--import',
+                   '--name', vm_name, '--vnc', '--ram=%s' % ram_mebibytes,
+                   '--disk path=%s,bus=ide' % vm_path] + attach_opts
+        if not autostart:
+            cmdline += '--noreboot'
+        cliapp.runcmd(cmdline)
 
 
 KvmPlusSshWriteExtension().run()
diff --git a/virtualbox-ssh.write b/virtualbox-ssh.write
index 37f56524..cb17b69b 100755
--- a/virtualbox-ssh.write
+++ b/virtualbox-ssh.write
@@ -62,6 +62,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         
         temp_root, location = args
         ssh_host, vm_name, vdi_path = self.parse_location(location)
+        autostart = self.parse_autostart()
         
         fd, raw_disk = tempfile.mkstemp()
         os.close(fd)
@@ -70,7 +71,8 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         try:
             self.transfer_and_convert_to_vdi(
                 raw_disk, ssh_host, vdi_path)
-            self.create_virtualbox_guest(ssh_host, vm_name, vdi_path)
+            self.create_virtualbox_guest(ssh_host, vm_name, vdi_path,
+                                         autostart)
         except BaseException:
             sys.stderr.write('Error deploying to VirtualBox')
             os.remove(raw_disk)
@@ -105,7 +107,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
                  str(os.path.getsize(raw_disk))],
                 stdin=f)
 
-    def create_virtualbox_guest(self, ssh_host, vm_name, vdi_path):
+    def create_virtualbox_guest(self, ssh_host, vm_name, vdi_path, autostart):
         '''Create the VirtualBox virtual machine.'''
         
         self.status(msg='Create VirtualBox virtual machine')
@@ -134,6 +136,9 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
                    '--medium', disk]
             commands.append(cmd)
 
+        if autostart:
+            commands.append(['startvm', vm_name])
+
         for command in commands:
             argv = ['ssh', ssh_host, 'VBoxManage'] + command
             cliapp.runcmd(argv)