Updating the Compute Admin guide to bring the XML into compliance wit…

…h the documentation conventions.

Other files will be committed as they're updated.
Fix bug 967297
Fixed merge on admin, configure, networking, and scheduler.
Fixed missing para tag.
Update pom.xml files for Quantum and API site.
Minor validation fixes for Quantum admin manual.

Change-Id: Idf77e2ed3d0cce61b01f3ca2ef8844beb65c77be

Updating more files in the compute admin guide. bug 967297

Change-Id: Iaa7649af928f4c794c1d014b713340e7b1e3b565

doc/src/docbkx/api-quick-start/pom.xml

@@ -49,7 +49,7 @@
       <plugin>
         <groupId>com.rackspace.cloud.api</groupId>
         <artifactId>clouddocs-maven-plugin</artifactId>
-        <version>1.0.9</version>
+        <version>1.2.0</version>
         <executions>
           <!--<execution>
             <id>goal1</id>

doc/src/docbkx/openstack-api-site/pom.xml

@@ -36,7 +36,7 @@
   </profiles>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <doctools.version>1.0.11-SNAPSHOT</doctools.version>
+    <doctools.version>1.2.0</doctools.version>
   </properties>
 
   <dependencies>

doc/src/docbkx/openstack-compute-admin/computeconfigure.xml

@@ -252,7 +252,7 @@ source ~/.bashrc</userinput></screen>
         edit <filename>/etc/network/interfaces</filename> with the
         following template, updated with your IP information.</para>
 
-      <programlisting language="bash">
+<programlisting language="bash">
 # The loopback network interface
 auto lo
     iface lo inet loopback
@@ -594,7 +594,7 @@ xenapi_remap_vbd_dev=true
 
     <para>On all nova-nodes, install python-netaddr:</para>
 
-    <para><literallayout class="monospaced">sudo apt-get install -y python-netaddr</literallayout></para>
+    <screen><prompt>$</prompt> <userinput>sudo apt-get install -y python-netaddr</userinput></screen>
 
     <para>On all nova-network nodes install radvd and configure IPv6
     networking:</para>
@@ -631,6 +631,7 @@ xenapi_remap_vbd_dev=true
 
     <para>Note that <literal>vlan_start</literal> and <literal>vpn_start</literal> parameters are not used by
     FlatDHCPManager.</para>
+
     <xi:include href="tables/ipv6-nova-conf.xml"/>
   </section>
 
@@ -794,6 +795,7 @@ root 5952 5908 6 11:29 pts/5 00:00:00 python /opt/nova-2010.4//bin/nova-objectst
 
           <screen><prompt>$</prompt> <userinput>ls -ld <filename><replaceable>NOVA-INST-DIR</replaceable>/instances/</filename></userinput></screen>
 
+
           <programlisting language="bash">
 drwxr-xr-x 2 root root 4096 2010-12-07 14:34 nova-install-dir/instances/
           </programlisting>
@@ -855,6 +857,7 @@ after :libvirtd_opts=" -d -l"
 <prompt>$</prompt> <userinput>ps -ef | grep libvirt</userinput></screen>
 
           <programlisting language="bash">
+
 root 1145 1 0 Nov27 ? 00:00:03 /usr/sbin/libvirtd -d -l
           </programlisting>
         </listitem>
@@ -901,6 +904,7 @@ root 1145 1 0 Nov27 ? 00:00:03 /usr/sbin/libvirtd -d -l
       However, if it is included the configuration, it must be set to
       <literal>nova.rpc.impl_kombu</literal>.</para>
 
+
       <programlisting language="bash">
 rpc_backend=nova.rpc.impl_kombu
       </programlisting>

doc/src/docbkx/openstack-compute-admin/computescheduler.xml

@@ -80,9 +80,10 @@ scheduler_default_filters=AvailabilityZoneFilter,RamFilter,ComputeFilter
                 <command>nova</command> command-line tool, use the <literal>--hint</literal>
                 flag:
 <screen>
-<prompt>$</prompt> <userinput>nova boot --image cedef40a-ed67-4d10-800e-17455edce175 --flavor 1 --hint different_host=[a0cf03a5-d921-4877-bb5c-86d26cf818e1,8c19174f-4220-44f0-824a-cd1eeef10287] server-1</userinput></screen>
+<prompt>$</prompt> <userinput>nova boot --image cedef40a-ed67-4d10-800e-17455edce175 --flavor 1 --hint different_host=[a0cf03a5-d921-4877-bb5c-86d26cf818e1,8c19174f-4220-44f0-824a-cd1eeef10287] server-1</userinput>
+</screen>
 With the API, use the <literal>os:scheduler_hints</literal> key:
-<programlisting>
+<programlisting language="json">
     {
     'server': {
         'name': 'server-1',
@@ -195,9 +196,10 @@ With the API, use the <literal>os:scheduler_hints</literal> key:
                 <command>nova</command> command-line tool, use the <literal>--hint</literal>
                 flag. For example, to specify the IP subnet <literal>192.168.1.1/24</literal></para>
 <screen>
-<prompt>$</prompt> <userinput>nova boot --image cedef40a-ed67-4d10-800e-17455edce175 --flavor 1 --hint build_near_host_ip=192.168.1.1 --hint cidr=/24 server-1</userinput></screen>
-<para>With the API, use the <literal>os:scheduler_hints</literal> key:</para>
-<programlisting>
+<prompt>$</prompt> <userinput>nova boot --image cedef40a-ed67-4d10-800e-17455edce175 --flavor 1 --hint build_near_host_ip=192.168.1.1 --hint cidr=/24 server-1</userinput>
+</screen>
+            <para>With the API, use the <literal>os:scheduler_hints</literal> key:</para>
+<programlisting language="json">
     {
     'server': {
         'name': 'server-1',

doc/src/docbkx/openstack-network-connectivity-admin/pom.xml

@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.0.9</version>
+                <version>1.2.0</version>
                 <executions>
                     <execution>
                         <id>goal1</id>

doc/src/docbkx/openstack-network-connectivity-admin/quantum-admin-guide.xml

@@ -599,7 +599,7 @@ list_ports &lt;tenant-id&gt; &lt;net-id&gt; [filterspec ...]</literallayout>
                     VMs on private networks with access to a public network. This gateway provides SNAT
                     to a public network, as well as ''floating IPs''.
             </para>
-            <para>
+
             <para>With Quantum Manager, a NAT gateway will be attached to each network if the the
                     Nova configuration specifies a valid "L3 driver".  Nova defaults to specifying the
                     'nova.network.l3.LinuxNetL3' driver, which corresponds to the same L3 + NAT implementation
@@ -609,7 +609,7 @@ list_ports &lt;tenant-id&gt; &lt;net-id&gt; [filterspec ...]</literallayout>
                     and an "external" network (e.g., used for Internet access).  Quantum allows a model
                     where nova-network is deployed in an "active-backup" high-availability model, but does
                     not support the "multi_host" mode where nova-network runs actively on each compute host. </para>
-            </para>
+
             <para> Specifying a Null L3 driver will mean no gateway devices are
                     connected to any Quantum networks:</para>
                 <literallayout class="monospaced">l3_lib=nova.network.l3.NullL3</literallayout>
@@ -673,9 +673,8 @@ list_ports &lt;tenant-id&gt; &lt;net-id&gt; [filterspec ...]</literallayout>
             <para>Nova defaults to connecting to Melange on localhost using the standard port.  The
             "melange_host" and "melange_port" options can override these defaults. </para>
                 <note> <para> Using Melange is incompatible with using Floating IPs. </para> </note>
-            </section>
-            <note><para>
-             DHCP is not supported when Melange is used as the IPAM library.
+
+            <note><para>DHCP is not supported when Melange is used as the IPAM library.
             </para></note>
             <note><para>
              In releases beyond Essex, Melange will be folded into the Quantum project, likely as part of a v2.0
@@ -694,6 +693,7 @@ list_ports &lt;tenant-id&gt; &lt;net-id&gt; [filterspec ...]</literallayout>
                                 that should be compatible with Quantum Manager.</para></listitem>
             </itemizedlist>
         </section>
+        </section>
     </chapter>
     <chapter xml:id="ch_quantum-keystone-authn-authz">
             <title> Quantum Keystone Authentication and Authorization</title>