From c76412c1a146fe3b2cbb09d7fb2b847725538cba Mon Sep 17 00:00:00 2001 From: annegentle Date: Fri, 22 Jun 2012 12:47:02 -0500 Subject: [PATCH] This patch adds the correct response .json file for the os-aggregates wadl Patch also attempts to fix the figures missing from the new externals chapter in the Compute Administration Manual. Change-Id: I62c1b83d4145eac8066c988f21d270c0ede23967 --- .../samples/os-aggregate-list-response.json | 30 +++++++++++++++++++ .../docbkx/openstack-install/ch_externals.xml | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/os-aggregate-list-response.json diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/os-aggregate-list-response.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/os-aggregate-list-response.json new file mode 100644 index 0000000000..dde9577e70 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/os-aggregate-list-response.json @@ -0,0 +1,30 @@ +{ + "aggregates": [ + { + "name": "Aggregate1", + "availability_zone": "nova", + "deleted": false, + "created_at": "1912-06-20 18:52:03", + "updated_at": null, + "hosts": [ + "devstack" + ], + "deleted_at": null, + "id": 1, + "metadata": {"key1": "val1"} + }, + { + "name": "Aggregate2", + "availability_zone": "nova", + "deleted": false, + "created_at": "1912-06-20 18:53:36", + "updated_at": null, + "hosts": [ + "devstack" + ], + "deleted_at": null, + "id": 2, + "metadata": {"key2": "val2", "key1": "val1"} + } + ] +} diff --git a/doc/src/docbkx/openstack-install/ch_externals.xml b/doc/src/docbkx/openstack-install/ch_externals.xml index b409c4fdb0..1326d9ecdd 100644 --- a/doc/src/docbkx/openstack-install/ch_externals.xml +++ b/doc/src/docbkx/openstack-install/ch_externals.xml @@ -4,8 +4,9 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> Underlying Technologies - You can think of OpenStack Compute as a toolkit for building a cloud computing environment - by stiching together existing Linux technologies. + You can think of OpenStack Compute as a toolkit for building + a cloud computing environment by stitching together existing + Linux technologies. The figures below shows two examples of how these underlying technologies can be assembled to construct an OpenStack Compute cloud. The circles are Linux services that are part of OpenStack Compute, and the rectangles are external (not maintained by the OpenStack project)