openstack/openstack-manuals
Code Issues Proposed changes

Fix inconsistent arguments/IPs in verify install

Browse Source 
fixes bug 1061232

A number of issues were outline in the bug report, such as the use
of depreceated '_' joiners in arguments for glance, and inconsistent
IP address examples in the verifying installation doc.

This patch fixes those and updates other areas using the old '_'
syntax

Change-Id: I61850200c98de622fa54bce04859321a7e711e92
This commit is contained in:
Tom Fifield
2012-10-09 17:59:09 +11:00
parent c27231c833
commit 20e566149e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/src/docbkx/openstack-compute-admin/computeadmin.xml
View File

@@ -160,10 +160,10 @@ format="SVG" scale="60"/>
<prompt>$</prompt> <userinput>nova help</userinput>
</screen>
<programlisting>
usage: nova [--debug] [--os_username OS_USERNAME] [--os_password OS_PASSWORD]
[--os_tenant_name OS_TENANT_NAME] [--os_auth_url OS_AUTH_URL]
[--os_region_name OS_REGION_NAME] [--service_type SERVICE_TYPE]
[--service_name SERVICE_NAME] [--endpoint_type ENDPOINT_TYPE]
usage: nova [--debug] [--os-username OS_USERNAME] [--os-password OS_PASSWORD]
[--os-tenant-name_name OS_TENANT_NAME] [--os-auth-url OS_AUTH_URL]
[--os-region-name OS_REGION_NAME] [--service-type SERVICE_TYPE]
[--service-name SERVICE_NAME] [--endpoint-type ENDPOINT_TYPE]
[--version VERSION]
&lt;subcommand&gt; ...
</programlisting>
@@ -172,7 +172,7 @@ usage: nova [--debug] [--os_username OS_USERNAME] [--os_password OS_PASSWORD]
client. By setting up the required parameters as
environment variables, you can fly through these
commands on the command line. You can add
<literal>--os_username</literal> on the nova
<literal>--os-username</literal> on the nova
command, or set them as environment variables: </para>
<para>
<screen>

12
doc/src/docbkx/openstack-install/images-verifying-install.xml
View File

@@ -18,32 +18,32 @@
wget http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-12.1_2.6.35-22_1.tar.gz
tar -zxvf ttylinux-uec-amd64-12.1_2.6.35-22_1.tar.gz </screen>
<para>Upload the kernel.</para>
<note><para>This example shows inputting --os_username, --os_password,
--os_tenant, --os_auth_url on the command line for
<note><para>This example shows inputting --os-username, --os-password,
--os-tenant-name, --os-auth-url on the command line for
reference. You could also use the OS_* environment
variables by setting them in an openrc file: </para>
<programlisting><xi:include parse="text" href="samples/openrc.txt"/></programlisting>
<para>Then you would source these environment variables by running <userinput>source openrc</userinput>.</para></note>
<screen>glance --os_username=admin --os_password=secretword --os_tenant=openstackDemo --os_auth_url=http://127.0.0.1:5000/v2.0 add name="tty-linux-kernel" disk_format=aki container_format=aki &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1-vmlinuz</screen>
<screen>glance --os-username=admin --os-password=secretword --os-tenant-name=openstackDemo --os-auth-url=http://192.168.206.130:5000/v2.0 add name="tty-linux-kernel" disk_format=aki container_format=aki &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1-vmlinuz</screen>
<programlisting>Uploading image 'tty-linux-kernel'
=================================================================================================================================================================[100%] 41.8M/s, ETA 0h 0m 0s
Added new image with ID: 599907ff-296d-4042-a671-d015e34317d2</programlisting>
<para>Upload the initrd.</para>
<screen>glance --os_username=admin --os_password=secretword --os_tenant=openstackDemo --os_auth_url=http://127.0.0.1:5000/v2.0 add name="tty-linux-ramdisk" disk_format=ari container_format=ari &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1-loader </screen>
<screen>glance --os-username=admin --os-password=secretword --os-tenant-name=openstackDemo --os-auth-url=http://192.168.206.130:5000/v2.0 add name="tty-linux-ramdisk" disk_format=ari container_format=ari &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1-loader </screen>
<programlisting>Uploading image 'tty-linux-ramdisk'
===========================================================================================================================================================[100%] 937.483441K/s, ETA 0h 0m 0s
Added new image with ID: 7d9f0378-1640-4e43-8959-701f248d999d</programlisting>
<para>Upload the image.</para>
<screen>glance --os_username=admin --os_password=secretword --os_tenant=openstackDemo --os_auth_url=http://127.0.0.1:5000/v2.0 add name="tty-linux" disk_format=ami container_format=ami kernel_id=599907ff-296d-4042-a671-d015e34317d2 ramdisk_id=7d9f0378-1640-4e43-8959-701f248d999d &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1.img </screen>
<screen>glance --os-username=admin --os-password=secretword --os-tenant-name=openstackDemo --os-auth-url=http://192.168.206.130:5000/v2.0 add name="tty-linux" disk_format=ami container_format=ami kernel_id=599907ff-296d-4042-a671-d015e34317d2 ramdisk_id=7d9f0378-1640-4e43-8959-701f248d999d &lt; ttylinux-uec-amd64-12.1_2.6.35-22_1.img </screen>
<programlisting>Uploading image 'tty-linux'
===========================================================================================================================================================[100%] 118.480514M/s, ETA 0h 0m 0s
Added new image with ID: 21b421e5-44d4-4903-9db0-4f134fdd0793</programlisting>
<para>Now a glance index should show a legitimate image.</para>
<programlisting>glance --os_username=admin --os_password=secretword --os_tenant=openstackDemo --os_auth_url=http://127.0.0.1:5000/v2.0 index
<programlisting>glance --os-username=admin --os-password=secretword --os-tenant-name=openstackDemo --os-auth-url=http://192.168.206.130:5000/v2.0 index
ID Name Disk Format Container Format Size
------------------------------------ ------------------------------ -------------------- -------------------- --------------
21b421e5-44d4-4903-9db0-4f134fdd0793 tty-linux ami ami 25165824