diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-02-12 17:02:35 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-02-12 17:02:35 +0000 |
commit | f6bd330de053c62f301d161ed47f63de4c4192b7 (patch) | |
tree | 22543a1bc396c5962634e02b137a8c671f5a6f44 | |
parent | c00ee1c6852d5d02cd9d9fdf071b9a3d838ad6ef (diff) | |
parent | d614da0228d03b0e64ebc512e88170f02de1d34b (diff) | |
download | morph-f6bd330de053c62f301d161ed47f63de4c4192b7.tar.gz |
Merge branch 'liw/deployment-fixes'
Reviewed-By: Richard Maw (on irc)
-rwxr-xr-x | morphlib/exts/kvm.write | 4 | ||||
-rwxr-xr-x | morphlib/writeexts.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/exts/kvm.write b/morphlib/exts/kvm.write index 09a7d224..1579dc1f 100755 --- a/morphlib/exts/kvm.write +++ b/morphlib/exts/kvm.write @@ -90,7 +90,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension): def transfer(self, raw_disk, ssh_host, vm_path): '''Transfer raw disk image to libvirt host.''' - self.status(msg='Transfer disk image') + self.status(msg='Transferring disk image') target = '%s:%s' % (ssh_host, vm_path) with open(raw_disk, 'rb') as f: cliapp.runcmd(['rsync', '-zS', raw_disk, target]) @@ -98,7 +98,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension): def create_libvirt_guest(self, ssh_host, vm_name, vm_path): '''Create the libvirt virtual machine.''' - self.status(msg='Create libvirt/kvm virtual machine') + self.status(msg='Creating libvirt/kvm virtual machine') cliapp.runcmd( ['ssh', ssh_host, 'virt-install', '--connect qemu:///system', '--import', diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 60848345..a479f3cb 100755 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -17,6 +17,7 @@ import cliapp import os import re +import sys import time import tempfile |