summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-12-01 16:53:23 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-12-01 16:53:23 +0000
commita06ebc0405235a3081c77c8db694c65d3ff3e81c (patch)
tree096a4491a756feddfc60ea2b3ee536c4ec82be3d
parent1a32c137eb99e0a265c8afd99491bfb400b78c77 (diff)
parent3b8b8b54850f6aee870ec6a08000d08819ad4e81 (diff)
downloadmorph-a06ebc0405235a3081c77c8db694c65d3ff3e81c.tar.gz
Merge branch 'baserock/pedroalvarez/rawdisk-to-device8'
Reviewed-by: - Richard Maw - Sam Thursfield
-rwxr-xr-xmorphlib/exts/openstack.write6
-rwxr-xr-xmorphlib/exts/rawdisk.check18
-rwxr-xr-xmorphlib/exts/rawdisk.write75
-rw-r--r--morphlib/writeexts.py96
4 files changed, 107 insertions, 88 deletions
diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
index 516fe367..b1941d3c 100755
--- a/morphlib/exts/openstack.write
+++ b/morphlib/exts/openstack.write
@@ -79,8 +79,7 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
def set_extlinux_root_to_virtio(self, raw_disk):
'''Re-configures extlinux to use virtio disks'''
self.status(msg='Updating extlinux.conf')
- mp = self.mount(raw_disk)
- try:
+ with self.mount(raw_disk) as mp:
path = os.path.join(mp, 'extlinux.conf')
with open(path) as f:
@@ -91,9 +90,6 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
with open(path, "w") as f:
f.write(extlinux_conf)
- finally:
- self.unmount(mp)
-
def get_openstack_parameters(self):
'''Get the environment variables needed.
diff --git a/morphlib/exts/rawdisk.check b/morphlib/exts/rawdisk.check
index acdc4de1..094adb72 100755
--- a/morphlib/exts/rawdisk.check
+++ b/morphlib/exts/rawdisk.check
@@ -33,10 +33,11 @@ class RawdiskCheckExtension(morphlib.writeexts.WriteExtension):
location = args[0]
upgrade = self.get_environment_boolean('UPGRADE')
if upgrade:
- if not os.path.isfile(location):
- raise cliapp.AppException(
- 'Cannot upgrade %s: it is not an existing disk image' %
- location)
+ if not self.is_device(location):
+ if not os.path.isfile(location):
+ raise cliapp.AppException(
+ 'Cannot upgrade %s: it is not an existing disk image' %
+ location)
version_label = os.environ.get('VERSION_LABEL')
if version_label is None:
@@ -44,9 +45,10 @@ class RawdiskCheckExtension(morphlib.writeexts.WriteExtension):
'VERSION_LABEL was not given. It is required when '
'upgrading an existing system.')
else:
- if os.path.exists(location):
- raise cliapp.AppException(
- 'Target %s already exists. Use `morph upgrade` if you '
- 'want to update an existing image.' % location)
+ if not self.is_device(location):
+ if os.path.exists(location):
+ raise cliapp.AppException(
+ 'Target %s already exists. Use `morph upgrade` if you '
+ 'want to update an existing image.' % location)
RawdiskCheckExtension().run()
diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 12db4398..b17f8aa7 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -43,67 +43,70 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
raise cliapp.AppException('Wrong number of command line args')
temp_root, location = args
- if os.path.isfile(location):
+ upgrade = self.get_environment_boolean('UPGRADE')
+
+ if upgrade:
self.upgrade_local_system(location, temp_root)
else:
try:
- self.create_local_system(temp_root, location)
- self.status(msg='Disk image has been created at %s' % location)
+ if not self.is_device(location):
+ with self.created_disk_image(location):
+ self.format_btrfs(location)
+ self.create_system(temp_root, location)
+ self.status(msg='Disk image has been created at %s' %
+ location)
+ else:
+ self.format_btrfs(location)
+ self.create_system(temp_root, location)
+ self.status(msg='System deployed to %s' % location)
except Exception:
- self.status(msg='Failure to create disk image at %s' %
+ self.status(msg='Failure to deploy system to %s' %
location)
- if os.path.exists(location):
- os.remove(location)
raise
def upgrade_local_system(self, raw_disk, temp_root):
self.complete_fstab_for_btrfs_layout(temp_root)
- mp = self.mount(raw_disk)
+ with self.mount(raw_disk) as mp:
+ version_label = self.get_version_label(mp)
+ self.status(msg='Updating image to a new version with label %s' %
+ version_label)
- version_label = self.get_version_label(mp)
- self.status(msg='Updating image to a new version with label %s' %
- version_label)
+ version_root = os.path.join(mp, 'systems', version_label)
+ os.mkdir(version_root)
- version_root = os.path.join(mp, 'systems', version_label)
- os.mkdir(version_root)
+ old_orig = os.path.join(mp, 'systems', 'default', 'orig')
+ new_orig = os.path.join(version_root, 'orig')
+ cliapp.runcmd(
+ ['btrfs', 'subvolume', 'snapshot', old_orig, new_orig])
- old_orig = os.path.join(mp, 'systems', 'default', 'orig')
- new_orig = os.path.join(version_root, 'orig')
- cliapp.runcmd(
- ['btrfs', 'subvolume', 'snapshot', old_orig, new_orig])
+ cliapp.runcmd(
+ ['rsync', '-a', '--checksum', '--numeric-ids', '--delete',
+ temp_root + os.path.sep, new_orig])
- cliapp.runcmd(
- ['rsync', '-a', '--checksum', '--numeric-ids', '--delete',
- temp_root + os.path.sep, new_orig])
+ self.create_run(version_root)
- self.create_run(version_root)
+ default_path = os.path.join(mp, 'systems', 'default')
+ if os.path.exists(default_path):
+ os.remove(default_path)
+ else:
+ # we are upgrading and old system that does
+ # not have an updated extlinux config file
+ if self.bootloader_config_is_wanted():
+ self.generate_bootloader_config(mp)
+ self.install_bootloader(mp)
+ os.symlink(version_label, default_path)
- default_path = os.path.join(mp, 'systems', 'default')
- if os.path.exists(default_path):
- os.remove(default_path)
- else:
- # we are upgrading and old system that does
- # not have an updated extlinux config file
if self.bootloader_config_is_wanted():
- self.generate_bootloader_config(mp)
- self.install_bootloader(mp)
- os.symlink(version_label, default_path)
-
- if self.bootloader_config_is_wanted():
- self.install_kernel(version_root, temp_root)
-
- self.unmount(mp)
+ self.install_kernel(version_root, temp_root)
def get_version_label(self, mp):
version_label = os.environ.get('VERSION_LABEL')
if version_label is None:
- self.unmount(mp)
raise cliapp.AppException('VERSION_LABEL was not given')
if os.path.exists(os.path.join(mp, 'systems', version_label)):
- self.unmount(mp)
raise cliapp.AppException('VERSION_LABEL %s already exists'
% version_label)
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index 0fd0ad7b..91936f64 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -22,6 +22,9 @@ import shutil
import sys
import time
import tempfile
+import errno
+import stat
+import contextlib
import morphlib
@@ -145,28 +148,39 @@ class WriteExtension(cliapp.Application):
def create_local_system(self, temp_root, raw_disk):
'''Create a raw system image locally.'''
+
+ with self.created_disk_image(raw_disk):
+ self.format_btrfs(raw_disk)
+ self.create_system(temp_root, raw_disk)
+
+ @contextlib.contextmanager
+ def created_disk_image(self, location):
size = self.get_disk_size()
if not size:
raise cliapp.AppException('DISK_SIZE is not defined')
- self.create_raw_disk_image(raw_disk, size)
+ self.create_raw_disk_image(location, size)
try:
- self.mkfs_btrfs(raw_disk)
- mp = self.mount(raw_disk)
+ yield
except BaseException:
- sys.stderr.write('Error creating disk image')
- os.remove(raw_disk)
+ os.unlink(location)
raise
+
+ def format_btrfs(self, raw_disk):
try:
- self.create_btrfs_system_layout(
- temp_root, mp, version_label='factory',
- disk_uuid=self.get_uuid(raw_disk))
- except BaseException, e:
- sys.stderr.write('Error creating Btrfs system layout')
- self.unmount(mp)
- os.remove(raw_disk)
+ self.mkfs_btrfs(raw_disk)
+ except BaseException:
+ sys.stderr.write('Error creating disk image')
raise
- else:
- self.unmount(mp)
+
+ def create_system(self, temp_root, raw_disk):
+ with self.mount(raw_disk) as mp:
+ try:
+ self.create_btrfs_system_layout(
+ temp_root, mp, version_label='factory',
+ disk_uuid=self.get_uuid(raw_disk))
+ except BaseException, e:
+ sys.stderr.write('Error creating Btrfs system layout')
+ raise
def _parse_size(self, size):
'''Parse a size from a string.
@@ -224,7 +238,7 @@ class WriteExtension(cliapp.Application):
def mkfs_btrfs(self, location):
'''Create a btrfs filesystem on the disk.'''
self.status(msg='Creating btrfs filesystem')
- cliapp.runcmd(['mkfs.btrfs', '-L', 'baserock', location])
+ cliapp.runcmd(['mkfs.btrfs', '-f', '-L', 'baserock', location])
def get_uuid(self, location):
'''Get the UUID of a block device's file system.'''
@@ -232,31 +246,26 @@ class WriteExtension(cliapp.Application):
# lies by exiting successfully.
return cliapp.runcmd(['blkid', '-s', 'UUID', '-o', 'value',
location]).strip()
-
- def mount(self, location):
- '''Mount the filesystem so it can be tweaked.
-
- Return path to the mount point.
- The mount point is a newly created temporary directory.
- The caller must call self.unmount to unmount on the return value.
-
- '''
- self.status(msg='Mounting filesystem')
- tempdir = tempfile.mkdtemp()
- cliapp.runcmd(['mount', '-o', 'loop', location, tempdir])
- return tempdir
-
- def unmount(self, mount_point):
- '''Unmount the filesystem mounted by self.mount.
-
- Also, remove the temporary directory.
-
- '''
-
- self.status(msg='Unmounting filesystem')
- cliapp.runcmd(['umount', mount_point])
- os.rmdir(mount_point)
+ @contextlib.contextmanager
+ def mount(self, location):
+ self.status(msg='Mounting filesystem')
+ try:
+ mount_point = tempfile.mkdtemp()
+ if self.is_device(location):
+ cliapp.runcmd(['mount', location, mount_point])
+ else:
+ cliapp.runcmd(['mount', '-o', 'loop', location, mount_point])
+ except BaseException, e:
+ sys.stderr.write('Error mounting filesystem')
+ os.rmdir(mount_point)
+ raise
+ try:
+ yield mount_point
+ finally:
+ self.status(msg='Unmounting filesystem')
+ cliapp.runcmd(['umount', mount_point])
+ os.rmdir(mount_point)
def create_btrfs_system_layout(self, temp_root, mountpoint, version_label,
disk_uuid):
@@ -572,3 +581,12 @@ class WriteExtension(cliapp.Application):
logging.error("Error checking SSH connectivity: %s", str(e))
raise cliapp.AppException(
'Unable to SSH to %s: %s' % (ssh_host, e))
+
+ def is_device(self, location):
+ try:
+ st = os.stat(location)
+ return stat.S_ISBLK(st.st_mode)
+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ return False
+ raise