summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-09 17:49:36 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-09 17:51:21 +0000
commit6c1cc0f3706d1019158b6a31735f416b974a1226 (patch)
treec40e47e20b2fd225e5e642681c19d9db0ce6c807
parentbfc74c3a2a1c5058e18653f4fb28e0390b66d520 (diff)
downloaddefinitions-6c1cc0f3706d1019158b6a31735f416b974a1226.tar.gz
deploy: Note that some of the extensions listed live in definitions.git
The user should be aware of this because if they aren't building baserock:baserock/definitions or a repo forked from it, those extensions won't be available. Also fix some long lines that I seem to have failed to commit already.
-rw-r--r--openstack.write.help8
-rw-r--r--rawdisk.write.help13
-rw-r--r--ssh-rsync.write.help4
3 files changed, 13 insertions, 12 deletions
diff --git a/openstack.write.help b/openstack.write.help
index 579512f5..75ad9f0c 100644
--- a/openstack.write.help
+++ b/openstack.write.help
@@ -16,15 +16,15 @@ help: |
where
* HOST is the host running OpenStack
- * PORT is the port which is using OpenStack for authentifications.
- * VERSION is the authentification version of OpenStack (Only v2.0
+ * PORT is the port which is using OpenStack for authentications.
+ * VERSION is the authentication version of OpenStack (Only v2.0
supported)
* OPENSTACK_USER=username: the username to use in the `--os-username`
argument to `glance`.
- * OPENSTACK_TENANT=tenant: the project name to use in the `--os-tenant-name`
- argument to `glance`.
+ * OPENSTACK_TENANT=tenant: the project name to use in the
+ `--os-tenant-name` argument to `glance`.
* OPENSTACK_IMAGENAME=imagename: the name of the image to use in the
`--name` argument to `glance`.
diff --git a/rawdisk.write.help b/rawdisk.write.help
index f225276d..81f35024 100644
--- a/rawdisk.write.help
+++ b/rawdisk.write.help
@@ -12,14 +12,15 @@ help: |
create virtual machines with KVM / libvirt, OpenStack or, after converting
it to VDI format, VirtualBox.
- `morph deploy` will fail if the file specified by `location` already exists.
+ `morph deploy` will fail if the file specified by `location` already
+ exists.
- If used in `morph upgrade`, the rootfs produced by 'morph build' is added to
- the existing raw disk image or device as an additional btrfs sub-volume.
+ If used in `morph upgrade`, the rootfs produced by 'morph build' is added
+ to the existing raw disk image or device as an additional btrfs sub-volume.
`morph upgrade` will fail if the file specified by `location` does not
- exist, or is not a Baserock raw disk image. (Most users are unlikely to need
- or use this functionality: it is useful mainly for developers working on the
- Baserock tools.)
+ exist, or is not a Baserock raw disk image. (Most users are unlikely to
+ need or use this functionality: it is useful mainly for developers working
+ on the Baserock tools.)
Parameters:
diff --git a/ssh-rsync.write.help b/ssh-rsync.write.help
index 4ef666e8..d03508c0 100644
--- a/ssh-rsync.write.help
+++ b/ssh-rsync.write.help
@@ -23,8 +23,8 @@ help: |
Parameters:
* location: the 'user@hostname' string that will be used by ssh and rsync.
- 'user' will always be `root` and `hostname` the hostname or address of the
- system being upgraded.
+ 'user' will always be `root` and `hostname` the hostname or address of
+ the system being upgraded.
* VERSION_LABEL=label - **(MANDATORY)** should contain only alpha-numeric
characters and the '-' (hyphen) character.