From b62055ea7d645debab8b298fb09c7815b3530817 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Tue, 24 Mar 2015 14:29:44 -0400
Subject: [PATCH] Tweak API Quick Start curl commands and remove v3 in response

We dont publish the v3 endpoint anymore in response to /v2.0/tokens so
remove that from get_credentials_resp.json. Also fixup the curl
commands a bit to they would generate the output (formatted json).

Change-Id: I96a52702e544d733bb5a397c6f674f39c412649e
---
 .../src/docbkx/api-quick-start-intro.xml      | 19 ++++++++++++-------
 .../src/docbkx/get_credentials_resp.json      | 14 --------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/api-quick-start/src/docbkx/api-quick-start-intro.xml b/api-quick-start/src/docbkx/api-quick-start-intro.xml
index e38c476f1..40489ee2c 100644
--- a/api-quick-start/src/docbkx/api-quick-start-intro.xml
+++ b/api-quick-start/src/docbkx/api-quick-start-intro.xml
@@ -151,17 +151,22 @@
                 xlink:href="http://developer.openstack.org/api-ref-compute-v2.html"
                 >Compute APIs and Extensions</link>.</para>
         <para>Use the Compute API to list flavors, as follows:</para>
-        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -i -H
-            "X-Auth-Token:<replaceable>token</replaceable>"
-            http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/flavors</userinput></screen>
+        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -s -H \
+            "X-Auth-Token:<replaceable>token</replaceable>" \
+            http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/flavors \
+            | python -m json.tool</userinput></screen>
         <programlisting><?db-font-size 60%?><xi:include href="flavors-post-resp.json" parse="text"/></programlisting>
         <para>Use the Compute API to list images, as follows:</para>
-        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -i -H
-            "X-Auth-Token:<replaceable>token</replaceable>"
-            http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/images</userinput></screen>
+        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -s -H \
+            "X-Auth-Token:<replaceable>token</replaceable>" \
+            http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/images \
+            | python -m json.tool</userinput></screen>
         <programlisting><?db-font-size 60%?><xi:include href="images-post-resp.json" parse="text"/></programlisting>
         <para>Use the Compute API to list servers, as follows:</para>
-        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -i -H "X-Auth-Token:<replaceable>token</replaceable>" http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/servers</userinput></screen>
+        <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -s -H \
+            "X-Auth-Token:<replaceable>token</replaceable>" \
+            http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/servers \
+            | python -m json.tool</userinput></screen>
         <programlisting><?db-font-size 60%?><xi:include href="servers-post-resp.json" parse="text"/></programlisting>
     </section>
 </section>
diff --git a/api-quick-start/src/docbkx/get_credentials_resp.json b/api-quick-start/src/docbkx/get_credentials_resp.json
index 364cade54..cefa5502c 100644
--- a/api-quick-start/src/docbkx/get_credentials_resp.json
+++ b/api-quick-start/src/docbkx/get_credentials_resp.json
@@ -77,20 +77,6 @@
                 "name": "glance",
                 "type": "image"
             },
-            {
-                "endpoints": [
-                    {
-                        "adminURL": "http://10.100.0.222:8774/v3",
-                        "id": "14187733d29845e5993d9b4e0f2df4fc",
-                        "internalURL": "http://10.100.0.222:8774/v3",
-                        "publicURL": "http://8.21.28.222:8774/v3",
-                        "region": "RegionOne"
-                    }
-                ],
-                "endpoints_links": [],
-                "name": "novav3",
-                "type": "computev3"
-            },
             {
                 "endpoints": [
                     {