openstack/openstack-manuals
Code Issues Proposed changes

install-guide: keystone minor fixes

Browse Source 
Fix some nits in the keystone section (spacing, colons...).

Explicitely list some commands that were only described.

Change-Id: I4d83dab65a598b66a45e245004203c3370be0c89
This commit is contained in:
Gauvain Pocentek 2014-03-30 22:22:21 +02:00
parent 31d4f6bee6
commit 5ff4593cbf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/install-guide/section_keystone-install.xml
View File

@ -30,7 +30,7 @@
database connection mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</userinput></screen> database connection mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</userinput></screen>
<para os="ubuntu">Edit <para os="ubuntu">Edit
<filename>/etc/keystone/keystone.conf</filename> and change <filename>/etc/keystone/keystone.conf</filename> and change
the <literal>[database]</literal> section.</para> the <literal>[database]</literal> section:</para>
<programlisting os="ubuntu" language="ini"> <programlisting os="ubuntu" language="ini">
... ...
[database] [database]
@ -53,8 +53,9 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
<para>By default, the Ubuntu packages create a SQLite database. <para>By default, the Ubuntu packages create a SQLite database.
Delete the <filename>keystone.db</filename> file created in Delete the <filename>keystone.db</filename> file created in
the <filename>/var/lib/keystone/</filename> directory so that it the <filename>/var/lib/keystone/</filename> directory so that it
does not get used by mistake.</para> does not get used by mistake:</para>
</step> <screen><prompt>#</prompt> <userinput>rm /var/lib/keystone/keystone.db</userinput></screen>
</step>
<step os="ubuntu"> <step os="ubuntu">
<para>Use the password that you set previously to log in as <para>Use the password that you set previously to log in as
root. Create a <literal>keystone</literal> database root. Create a <literal>keystone</literal> database
@ -62,9 +63,10 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
<screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput> <screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput>
<prompt>mysql></prompt> <userinput>CREATE DATABASE keystone;</userinput> <prompt>mysql></prompt> <userinput>CREATE DATABASE keystone;</userinput>
<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' \ <prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' \
IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput> IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput>
<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' \ <prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' \
IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput></screen> IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput>
<prompt>mysql></prompt> <userinput>exit</userinput></screen>
</step> </step>
<step os="ubuntu"> <step os="ubuntu">
<para>Create the database tables for the Identity Service:</para> <para>Create the database tables for the Identity Service:</para>
@ -180,7 +182,7 @@ admin_token = ADMIN_TOKEN
<para os="ubuntu">Edit <para os="ubuntu">Edit
<filename>/etc/keystone/keystone.conf</filename> and change <filename>/etc/keystone/keystone.conf</filename> and change
the <literal>[DEFAULT]</literal> section, replacing the <literal>[DEFAULT]</literal> section, replacing
ADMIN_TOKEN with the results of the command.</para> ADMIN_TOKEN with the results of the command:</para>
<programlisting os="ubuntu" language="ini">[DEFAULT] <programlisting os="ubuntu" language="ini">[DEFAULT]
# A "shared secret" between keystone and other openstack services # A "shared secret" between keystone and other openstack services
admin_token = ADMIN_TOKEN admin_token = ADMIN_TOKEN

6
doc/install-guide/section_keystone-users.xml
View File

@ -13,13 +13,13 @@
in the next section.</para> in the next section.</para>
<para>Typically, you would indicate a user and password to <para>Typically, you would indicate a user and password to
authenticate with the Identity Service. At this point, however, we authenticate with the Identity Service. At this point, however, you
have not created any users, so we have to use the authorization have not created any users, so you have to use the authorization
token created in an earlier step, see <xref linkend="keystone-install"/> token created in an earlier step, see <xref linkend="keystone-install"/>
for further details. You can pass this with the for further details. You can pass this with the
<option>--os-token</option> option to the <option>--os-token</option> option to the
<command>keystone</command> command or set the <command>keystone</command> command or set the
<envar>OS_SERVICE_TOKEN</envar> environment variable. We'll set <envar>OS_SERVICE_TOKEN</envar> environment variable. Set
<envar>OS_SERVICE_TOKEN</envar>, as well as <envar>OS_SERVICE_TOKEN</envar>, as well as
<envar>OS_SERVICE_ENDPOINT</envar> to specify where the Identity <envar>OS_SERVICE_ENDPOINT</envar> to specify where the Identity
Service is running. Replace Service is running. Replace