From 000d84d41dee819d569b3a7f7976540cbeb6059b Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Fri, 20 Dec 2013 15:13:24 -0600 Subject: [PATCH] Fix JSON example Closes-Bug: #1240800 Change-Id: I1c61393b7e03bda9005e5111e35968f6bbb82cdd author: diane fleming --- .../compute/samples/cells-resp.json | 26 +++++++++++++++++ .../compute/section_compute-cells.xml | 29 ++----------------- 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 doc/config-reference/compute/samples/cells-resp.json diff --git a/doc/config-reference/compute/samples/cells-resp.json b/doc/config-reference/compute/samples/cells-resp.json new file mode 100644 index 0000000000..8cd718a1f4 --- /dev/null +++ b/doc/config-reference/compute/samples/cells-resp.json @@ -0,0 +1,26 @@ +{ + "parent": { + "name": "parent", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": true, + }, + "cell1": { + "name": "cell1", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit1.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": false, + }, + "cell2": { + "name": "cell2", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit2.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": false, + } +} \ No newline at end of file diff --git a/doc/config-reference/compute/section_compute-cells.xml b/doc/config-reference/compute/section_compute-cells.xml index 188f0d94cc..96853f9194 100644 --- a/doc/config-reference/compute/section_compute-cells.xml +++ b/doc/config-reference/compute/section_compute-cells.xml @@ -252,32 +252,7 @@ rabbit_virtual_host=cell1_vhost rabbit://<username>:<password>@<hostname>:<port>/<virtual_host> - The scheme may be either 'rabbit' (shown above) or 'qpid'. The following sample shows this optional configuration: - { - "parent": { - "name": "parent", - "api_url": "http://api.example.com:8774", - "transport_url": "rabbit://rabbit.example.com", - "weight_offset": 0.0, - "weight_scale": 1.0, - "is_parent": true, - }, - "cell1": { - "name": "cell1", - "api_url": "http://api.example.com:8774", - "transport_url": "rabbit://rabbit1.example.com", - "weight_offset": 0.0, - "weight_scale": 1.0, - "is_parent": false, - }, - "cell2": { - "name": "cell2", - "api_url": "http://api.example.com:8774", - "transport_url": "rabbit://rabbit2.example.com", - "weight_offset": 0.0, - "weight_scale": 1.0, - "is_parent": false, - } -} + The scheme can be either qpid or rabbit, as shown previously. The following sample shows this optional configuration: +