From bfc74c3a2a1c5058e18653f4fb28e0390b66d520 Mon Sep 17 00:00:00 2001 From: Pete Fotheringham Date: Fri, 5 Dec 2014 15:34:07 +0000 Subject: Add a reference to write.help file --- openstack.write | 1 + rawdisk.write | 12 ++---------- ssh-rsync.write | 10 ++-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/openstack.write b/openstack.write index faf47f54..d29d2661 100755 --- a/openstack.write +++ b/openstack.write @@ -28,6 +28,7 @@ import morphlib.writeexts class OpenStackWriteExtension(morphlib.writeexts.WriteExtension): + '''See openstack.write.help for documentation''' def process_args(self, args): if len(args) != 2: diff --git a/rawdisk.write b/rawdisk.write index b17f8aa7..d91a4d5f 100755 --- a/rawdisk.write +++ b/rawdisk.write @@ -29,19 +29,12 @@ import morphlib.writeexts class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): - '''Create a raw disk image during Morph's deployment. - - If the image already exists, it is upgraded. - - The location command line argument is the pathname of the disk image - to be created/upgraded. - - ''' + '''See rawdisk.write.help for documentation''' def process_args(self, args): if len(args) != 2: raise cliapp.AppException('Wrong number of command line args') - + temp_root, location = args upgrade = self.get_environment_boolean('UPGRADE') @@ -114,4 +107,3 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): RawDiskWriteExtension().run() - diff --git a/ssh-rsync.write b/ssh-rsync.write index 2d7258ba..c4577026 100755 --- a/ssh-rsync.write +++ b/ssh-rsync.write @@ -37,14 +37,8 @@ def ssh_runcmd_ignore_failure(location, command, **kwargs): class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): - '''Upgrade a running baserock system with ssh and rsync. - - It assumes the system is baserock-based and has a btrfs partition. - - The location command line argument is the 'user@hostname' string - that will be passed to ssh and rsync - - ''' + '''See ssh-rsync.write.help for documentation''' + def find_root_disk(self, location): '''Read /proc/mounts on location to find which device contains "/"''' -- cgit v1.2.1