From 549be4ba1d84ba749ea79c7a0d1e8953ef9d4cfd Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Mon, 22 Dec 2014 13:33:13 -0600
Subject: [PATCH] Fix additional issue with _member_ role creation

I removed the '--tenant' option from the admin user/tenant
creation step because the latter needs only the admin role.
Also, I provided an explanation about automatic assignment
and/or creation of the _member_ role.

Change-Id: I036ae43b73c8ca469e04e8090e197d57a7a5f5d0
Closes-Bug: #1403136
backport: juno
---
 doc/install-guide/section_keystone-users.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/install-guide/section_keystone-users.xml b/doc/install-guide/section_keystone-users.xml
index bb140ef5fd..cf6924bce4 100644
--- a/doc/install-guide/section_keystone-users.xml
+++ b/doc/install-guide/section_keystone-users.xml
@@ -62,9 +62,8 @@
           </note>
         </step>
         <step>
-          <para>Create the <literal>admin</literal> user under the
-            <literal>admin</literal> tenant:</para>
-          <screen><prompt>$</prompt> <userinput>keystone user-create --name admin --tenant admin --pass <replaceable>ADMIN_PASS</replaceable> --email <replaceable>EMAIL_ADDRESS</replaceable></userinput>
+          <para>Create the <literal>admin</literal> user:</para>
+          <screen><prompt>$</prompt> <userinput>keystone user-create --name admin --pass <replaceable>ADMIN_PASS</replaceable> --email <replaceable>EMAIL_ADDRESS</replaceable></userinput>
 <computeroutput>+----------+----------------------------------+
 | Property |              Value               |
 +----------+----------------------------------+
@@ -72,7 +71,6 @@
 | enabled  |               True               |
 |    id    | ea8c352d253443118041c9c8b8416040 |
 |   name   |              admin               |
-| tenantId | 6f4c1e4cbfef4d5a8a1345882fbca110 |
 | username |              admin               |
 +----------+----------------------------------+</computeroutput></screen>
           <para>Replace <replaceable>ADMIN_PASS</replaceable> with a
@@ -144,6 +142,12 @@
           <para>Replace <replaceable>DEMO_PASS</replaceable> with a suitable
             password and <replaceable>EMAIL_ADDRESS</replaceable> with a
             suitable e-mail address.</para>
+          <note>
+            <para>Using the <literal>--tenant</literal> option
+              automatically assigns the <literal>_member_</literal> role
+              to a user. This option will also create the
+              <literal>_member_</literal> role if it does not exist.</para>
+          </note>
         </step>
       </substeps>
       <note>