From 445f93e1d7e1798ea6e2f55fed7955b8b2b68dda Mon Sep 17 00:00:00 2001
From: liu-sheng <liusheng@huawei.com>
Date: Mon, 14 Jul 2014 19:07:57 +0800
Subject: [PATCH] Correct the return of "keystone service-create"

In keystone-service documentation, the return of "keystone service-create"
is missing "enabled" field, this change fix it.
Additionally, this change fix some aligning error of this
documentation, and redundant return of "keystone service-delete"

Change-Id: I5b17fea3e322483310ec5d07b755d80fc25759ce
Closes-Bug: #1341184
---
 doc/common/section_cli_keystone_services.xml    | 10 ++--------
 doc/install-guide/section_keystone-services.xml | 17 +++++++++--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/doc/common/section_cli_keystone_services.xml b/doc/common/section_cli_keystone_services.xml
index 38fc5b0c16..7d26a54349 100644
--- a/doc/common/section_cli_keystone_services.xml
+++ b/doc/common/section_cli_keystone_services.xml
@@ -89,6 +89,7 @@
 |   Property  |              Value               |
 +-------------+----------------------------------+
 | description |       object store service       |
+|   enabled   |               True               |
 |      id     | 84c23f4b942c44c38b9c42c5e517cd9a |
 |     name    |              swift               |
 |     type    |           object-store           |
@@ -104,6 +105,7 @@
 |   Property  |              Value               |
 +-------------+----------------------------------+
 | description |       object store service       |
+|   enabled   |               True               |
 |      id     | 84c23f4b942c44c38b9c42c5e517cd9a |
 |     name    |              swift               |
 |     type    |           object-store           |
@@ -163,13 +165,5 @@
         <title>Delete a service</title>
         <para>To delete a specified service, specify its ID:</para>
         <screen><prompt>$</prompt> <userinput>keystone service-delete <replaceable>SERVICE_ID</replaceable></userinput></screen>
-        <screen><computeroutput>+-------------+----------------------------------+
-|   Property  |              Value               |
-+-------------+----------------------------------+
-| description |       object store service       |
-|      id     | 84c23f4b942c44c38b9c42c5e517cd9a |
-|     name    |              swift               |
-|     type    |           object-store           |
-+-------------+----------------------------------+</computeroutput></screen>
     </section>
 </section>
diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml
index 01f83db1b0..5c63d09764 100644
--- a/doc/install-guide/section_keystone-services.xml
+++ b/doc/install-guide/section_keystone-services.xml
@@ -30,9 +30,10 @@
 |   Property  |              Value               |
 +-------------+----------------------------------+
 | description |        OpenStack Identity        |
-| id          | 15c11a23667e427e91bc31335b45f4bd |
-| name        |             keystone             |
-| type        |             identity             |
+|   enabled   |               True               |
+|      id     | 15c11a23667e427e91bc31335b45f4bd |
+|     name    |             keystone             |
+|     type    |             identity             |
 +-------------+----------------------------------+</computeroutput></screen>
       <note>
         <para>Because OpenStack generates IDs dynamically, you will see
@@ -58,12 +59,12 @@
 <computeroutput>+-------------+----------------------------------+
 |   Property  |             Value                |
 +-------------+----------------------------------+
-| adminurl    |   http://controller:35357/v2.0   |
-| id          | 11f9c625a3b94a3f8e66bf4e5de2679f |
+|   adminurl  |   http://controller:35357/v2.0   |
+|      id     | 11f9c625a3b94a3f8e66bf4e5de2679f |
 | internalurl |   http://controller:5000/v2.0    |
-| publicurl   |   http://controller:5000/v2.0    |
-| region      |           regionOne              |
-| service_id  | 15c11a23667e427e91bc31335b45f4bd |
+|  publicurl  |   http://controller:5000/v2.0    |
+|    region   |           regionOne              |
+|  service_id | 15c11a23667e427e91bc31335b45f4bd |
 +-------------+----------------------------------+</computeroutput></screen>
       <note>
         <para>This command references the ID of the service that you created