openstack/octavia
Code Issues Proposed changes

Fix diskimage-create README.rst

Browse Source 
We missed updating the diskimage-create README.rst when we added
some new command line options. This patch corrects those omisions.

Change-Id: I28dbc5b83321a69e060ea7fef5a1889ec623a3be
This commit is contained in:
Michael Johnson
2018-10-29 11:52:09 -07:00
parent 3cf910baa8
commit 4b1c374bdc
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diskimage-create/README.rst
View File

@@ -47,7 +47,7 @@ Usage
===== =====
This script and associated elements will build Amphora images. Current support This script and associated elements will build Amphora images. Current support
is with an Ubuntu base OS and HAProxy. The script can use Fedora is with an Ubuntu base OS and HAProxy. The script can use Fedora
or CentOS as a base OS but these will not initially be tested or supported. as a base OS but these will not initially be tested or supported.
As the project progresses and/or the diskimage-builder project adds support As the project progresses and/or the diskimage-builder project adds support
for additional base OS options they may become available for Amphora images. for additional base OS options they may become available for Amphora images.
This does not mean that they are necessarily supported or tested. This does not mean that they are necessarily supported or tested.
@@ -68,19 +68,25 @@ Command syntax:
[-a i386 | **amd64** | armhf ] [-a i386 | **amd64** | armhf ]
[-b **haproxy** ] [-b **haproxy** ]
[-c **~/.cache/image-create** | <cache directory> ] [-c **~/.cache/image-create** | <cache directory> ]
[-d **xenial**/**7** | trusty | <other release id> ]
[-e]
[-h] [-h]
[-i **ubuntu** | fedora | centos | rhel ] [-i **ubuntu** | fedora | centos | rhel ]
[-n] [-n]
[-o **amphora-x64-haproxy** | <filename> ] [-o **amphora-x64-haproxy** | <filename> ]
[-p]
[-r <root password> ] [-r <root password> ]
[-s **2** | <size in GB> ] [-s **2** | <size in GB> ]
[-t **qcow2** | tar ] [-t **qcow2** | tar ]
[-v] [-v]
[-w <working directory> ] [-w <working directory> ]
[-x]
'-a' is the architecture type for the image (default: amd64) '-a' is the architecture type for the image (default: amd64)
'-b' is the backend type (default: haproxy) '-b' is the backend type (default: haproxy)
'-c' is the path to the cache directory (default: ~/.cache/image-create) '-c' is the path to the cache directory (default: ~/.cache/image-create)
'-d' distribution release id (default on ubuntu: xenial)
'-e' enable complete mandatory access control systems when available (default: permissive)
'-h' display help message '-h' display help message
'-i' is the base OS (default: ubuntu) '-i' is the base OS (default: ubuntu)
'-n' disable sshd (default: enabled) '-n' disable sshd (default: enabled)
@@ -91,6 +97,7 @@ Command syntax:
'-t' is the image type (default: qcow2) '-t' is the image type (default: qcow2)
'-v' display the script version '-v' display the script version
'-w' working directory for image building (default: .) '-w' working directory for image building (default: .)
'-x' enable tracing for diskimage-builder
Environment Variables Environment Variables

1
diskimage-create/diskimage-create.sh
View File

@@ -35,6 +35,7 @@ usage() {
echo " [-t **qcow2** | tar | vhd | raw ]" echo " [-t **qcow2** | tar | vhd | raw ]"
echo " [-v]" echo " [-v]"
echo " [-w <working directory> ]" echo " [-w <working directory> ]"
echo " [-x]"
echo echo
echo " '-a' is the architecture type for the image (default: amd64)" echo " '-a' is the architecture type for the image (default: amd64)"
echo " '-b' is the backend type (default: haproxy)" echo " '-b' is the backend type (default: haproxy)"