openstack/api-site
Code Issues Proposed changes

Tweak API Quick Start curl commands and remove v3 in response

Browse Source 
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
This commit is contained in:
Davanum Srinivas 2015-03-24 14:29:44 -04:00
parent c369b56ab3
commit b62055ea7d
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api-quick-start/src/docbkx/api-quick-start-intro.xml
View File

@ -151,17 +151,22 @@
xlink:href="http://developer.openstack.org/api-ref-compute-v2.html" xlink:href="http://developer.openstack.org/api-ref-compute-v2.html"
>Compute APIs and Extensions</link>.</para> >Compute APIs and Extensions</link>.</para>
<para>Use the Compute API to list flavors, as follows:</para> <para>Use the Compute API to list flavors, as follows:</para>
<screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -i -H <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -s -H \
"X-Auth-Token:<replaceable>token</replaceable>" "X-Auth-Token:<replaceable>token</replaceable>" \
http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/flavors</userinput></screen> 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> <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> <para>Use the Compute API to list images, as follows:</para>
<screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -i -H <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>curl -s -H \
"X-Auth-Token:<replaceable>token</replaceable>" "X-Auth-Token:<replaceable>token</replaceable>" \
http://8.21.28.222:8774/v2/<replaceable>tenant_id</replaceable>/images</userinput></screen> 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> <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> <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> <programlisting><?db-font-size 60%?><xi:include href="servers-post-resp.json" parse="text"/></programlisting>
</section> </section>
</section> </section>

14
api-quick-start/src/docbkx/get_credentials_resp.json
View File

@ -77,20 +77,6 @@
"name": "glance", "name": "glance",
"type": "image" "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": [ "endpoints": [
{ {