openstack/openstack-manuals
Code Issues Proposed changes

Merge "cleanup of ch_openstack_images"

Browse Source
This commit is contained in:
Jenkins 2014-02-06 19:52:01 +00:00 committed by Gerrit Code Review
commit 4ddeb388fb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/image-guide/ch_openstack_images.xml
View File

@ -302,7 +302,7 @@
key</title>
<para>If you are unable or unwilling to install cloud-init
inside the guest, you can write a custom script to
fetch the public and add it to a user account.</para>
fetch the public key and add it to a user account.</para>
<para>To fetch the ssh public key and add it to the root
account, edit the <filename>/etc/rc.local</filename>
file and add the following lines before the line
@ -357,16 +357,15 @@ done</programlisting>
<section xml:id="metadata">
<title>Process user data and other metadata
(cloud-init)</title>
<para>In additional the ssh public key, an image may need to
<para>In addition to the ssh public key, an image may need to
retrieve additional information from OpenStack, such as
<link
xlink:href="http://docs.openstack.org/user-guide/content/user-data.html"
>user data</link> that the user submitted when
requesting the image. For example, you might want to set the
host name of the instance to name given to the instance
when it is booted. Or, you might wish to configure your
image so that it executes user data content as a script on
boot.</para>
host name of the instance when it is booted. Or, you might
wish to configure your image so that it executes user data
content as a script on boot.</para>
<para>This information is accessible through the metadata service
or the <link
xlink:href="http://docs.openstack.org/user-guide/content/config-drive.html"