openstack/openstack-manuals
Code Issues Proposed changes

Fix JSON example

Browse Source 
Closes-Bug: #1240800

Change-Id: I1c61393b7e03bda9005e5111e35968f6bbb82cdd
author: diane fleming
This commit is contained in:
Diane Fleming 2013-12-20 15:13:24 -06:00
parent 286661f9ef
commit 000d84d41d
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
doc/config-reference/compute/samples/cells-resp.json Normal file
View File

@ -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,
}
}

29
doc/config-reference/compute/section_compute-cells.xml
View File

@ -252,32 +252,7 @@ rabbit_virtual_host=cell1_vhost</programlisting></para>
<programlisting>
rabbit://&lt;username>:&lt;password>@&lt;hostname>:&lt;port>/&lt;virtual_host>
</programlisting>
<para>The scheme may be either 'rabbit' (shown above) or 'qpid'. The following sample shows this optional configuration:</para>
<programlisting language="json">{
"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,
}
}</programlisting>
<para>The scheme can be either <literal>qpid</literal> or <literal>rabbit</literal>, as shown previously. The following sample shows this optional configuration:</para>
<programlisting language="json"><xi:include href="samples/cells-resp.json" parse="text"/></programlisting>
</section>
</section>