summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-07 13:10:33 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-10 10:57:38 +0000
commit3922c6a4f8df62b0f89d455ab7842d0cce5d29e6 (patch)
tree82cc38aa9fc46ae3fc61e9c3591bf67df2bf3dc3
parent5560217b3b331e7e4d9c166cb6eecc7c9415545a (diff)
downloadmorph-3922c6a4f8df62b0f89d455ab7842d0cce5d29e6.tar.gz
Don't create the rawdisk image inside of create_local_system
Now we can use create_local_system to deploy create a system in a device or in a rawdisk image.
-rwxr-xr-xmorphlib/exts/kvm.write1
-rwxr-xr-xmorphlib/exts/openstack.write1
-rwxr-xr-xmorphlib/exts/rawdisk.write1
-rwxr-xr-xmorphlib/exts/virtualbox-ssh.write1
-rw-r--r--morphlib/writeexts.py1
5 files changed, 4 insertions, 1 deletions
diff --git a/morphlib/exts/kvm.write b/morphlib/exts/kvm.write
index 16f188b5..dd46d36b 100755
--- a/morphlib/exts/kvm.write
+++ b/morphlib/exts/kvm.write
@@ -62,6 +62,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
fd, raw_disk = tempfile.mkstemp()
os.close(fd)
+ self.create_raw_disk_image(raw_disk)
self.create_local_system(temp_root, raw_disk)
try:
diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
index 516fe367..744fde58 100755
--- a/morphlib/exts/openstack.write
+++ b/morphlib/exts/openstack.write
@@ -68,6 +68,7 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
fd, raw_disk = tempfile.mkstemp()
os.close(fd)
+ self.create_raw_disk_image(raw_disk)
self.create_local_system(temp_root, raw_disk)
self.status(msg='Temporary disk image has been created at %s'
% raw_disk)
diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 12db4398..7d0ebaee 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -47,6 +47,7 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
self.upgrade_local_system(location, temp_root)
else:
try:
+ self.create_raw_disk_image(location)
self.create_local_system(temp_root, location)
self.status(msg='Disk image has been created at %s' % location)
except Exception:
diff --git a/morphlib/exts/virtualbox-ssh.write b/morphlib/exts/virtualbox-ssh.write
index 39ea8f86..8c3d3059 100755
--- a/morphlib/exts/virtualbox-ssh.write
+++ b/morphlib/exts/virtualbox-ssh.write
@@ -68,6 +68,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
fd, raw_disk = tempfile.mkstemp()
os.close(fd)
+ self.create_raw_disk_image(raw_disk)
self.create_local_system(temp_root, raw_disk)
try:
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index 32920458..dc792eaf 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -145,7 +145,6 @@ class WriteExtension(cliapp.Application):
def create_local_system(self, temp_root, raw_disk):
'''Create a raw system image locally.'''
- self.create_raw_disk_image(raw_disk)
try:
self.mkfs_btrfs(raw_disk)
mp = self.mount(raw_disk)