openstack/openstack-manuals
Code Issues Proposed changes

Merge "Correct the return of "keystone service-create""

Browse Source
This commit is contained in:
Jenkins
2014-07-17 08:48:44 +00:00
committed by Gerrit Code Review
parent be0279df94 445f93e1d7
commit 61e4a39c4f
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/common/section_cli_keystone_services.xml
View File

@@ -89,6 +89,7 @@
| Property | Value | | Property | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| description | object store service | | description | object store service |
| enabled | True |
| id | 84c23f4b942c44c38b9c42c5e517cd9a | | id | 84c23f4b942c44c38b9c42c5e517cd9a |
| name | swift | | name | swift |
| type | object-store | | type | object-store |
@@ -104,6 +105,7 @@
| Property | Value | | Property | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| description | object store service | | description | object store service |
| enabled | True |
| id | 84c23f4b942c44c38b9c42c5e517cd9a | | id | 84c23f4b942c44c38b9c42c5e517cd9a |
| name | swift | | name | swift |
| type | object-store | | type | object-store |
@@ -163,13 +165,5 @@
<title>Delete a service</title> <title>Delete a service</title>
<para>To delete a specified service, specify its ID:</para> <para>To delete a specified service, specify its ID:</para>
<screen><prompt>$</prompt> <userinput>keystone service-delete <replaceable>SERVICE_ID</replaceable></userinput></screen> <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>
</section> </section>

17
doc/install-guide/section_keystone-services.xml
View File

@@ -30,9 +30,10 @@
| Property | Value | | Property | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| description | OpenStack Identity | | description | OpenStack Identity |
| id | 15c11a23667e427e91bc31335b45f4bd | | enabled | True |
| name | keystone | | id | 15c11a23667e427e91bc31335b45f4bd |
| type | identity | | name | keystone |
| type | identity |
+-------------+----------------------------------+</computeroutput></screen> +-------------+----------------------------------+</computeroutput></screen>
<note> <note>
<para>Because OpenStack generates IDs dynamically, you will see <para>Because OpenStack generates IDs dynamically, you will see
@@ -58,12 +59,12 @@
<computeroutput>+-------------+----------------------------------+ <computeroutput>+-------------+----------------------------------+
| Property | Value | | Property | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| adminurl | http://controller:35357/v2.0 | | adminurl | http://controller:35357/v2.0 |
| id | 11f9c625a3b94a3f8e66bf4e5de2679f | | id | 11f9c625a3b94a3f8e66bf4e5de2679f |
| internalurl | http://controller:5000/v2.0 | | internalurl | http://controller:5000/v2.0 |
| publicurl | http://controller:5000/v2.0 | | publicurl | http://controller:5000/v2.0 |
| region | regionOne | | region | regionOne |
| service_id | 15c11a23667e427e91bc31335b45f4bd | | service_id | 15c11a23667e427e91bc31335b45f4bd |
+-------------+----------------------------------+</computeroutput></screen> +-------------+----------------------------------+</computeroutput></screen>
<note> <note>
<para>This command references the ID of the service that you created <para>This command references the ID of the service that you created