Clean Common

This patch works several files that were not in common use back
into the documents they should live with.

The intended end result of this activity is to make common as lean as
possible so it can be more easily translated.

Also: Don't include configdrive table in user-guide since it's not
relevant for audience

Change-Id: Iacd5c68c639e60e8c711cb18351543e477444299

doc/admin-guide-cloud/compute/section_compute-security.xml

@@ -5,7 +5,7 @@
   <para>You can integrate OpenStack Compute with various third-party technologies to increase
     security. For information, see the <link xlink:href="http://docs.openstack.org/sec/"
         ><citetitle>OpenStack Security Guide</citetitle></link>.</para>
-  <xi:include href="../../common/section_trusted-compute-pools.xml"/>
+  <xi:include href="section_trusted-compute-pools.xml"/>
   <section xml:id="section_compute_metadata_https">
     <title>Encrypt Compute metadata traffic</title>
     <para>OpenStack Juno supports encrypting Compute metadata traffic with HTTPS. You enable SSL

doc/admin-guide-cloud/compute/section_compute-system-admin.xml

@@ -88,7 +88,7 @@
     </section>
     <xi:include href="../../common/section_cli_nova_volumes.xml"/>
     <xi:include href="../../common/section_cli_nova_customize_flavors.xml"/>
-    <xi:include href="../../common/section_compute_config-firewalls.xml"/>
+    <xi:include href="section_compute_config-firewalls.xml"/>
     <section xml:id="admin-password-injection">
         <?dbhtml stop-chunking?>
         <title>Inject administrator password</title>

doc/admin-guide-cloud/compute/section_trusted-compute-pools.xml

@@ -42,12 +42,12 @@
     <mediaobject>
         <imageobject role="fo">
             <imagedata
-                fileref="figures/OpenStackTrustedComputePool1.png"
+                fileref="../../common/figures/OpenStackTrustedComputePool1.png"
                 format="PNG" contentwidth="6in"/>
         </imageobject>
         <imageobject role="html">
             <imagedata
-                fileref="figures/OpenStackTrustedComputePool1.png"
+                fileref="../../common/figures/OpenStackTrustedComputePool1.png"
                 format="PNG" contentwidth="6in"/>
         </imageobject>
     </mediaobject>
@@ -126,7 +126,7 @@ auth_blob=i-am-openstack</programlisting>
             <para>To customize the trusted compute pools, use the following configuration
                 option settings:
             </para>
-            <xi:include href="tables/nova-trustedcomputing.xml"/>
+            <xi:include href="../../common/tables/nova-trustedcomputing.xml"/>
         </section>
     </section>
     <section xml:id="trusted_flavors">
@@ -147,12 +147,12 @@ auth_blob=i-am-openstack</programlisting>
                     <mediaobject>
                         <imageobject role="fo">
                             <imagedata
-                                fileref="figures/OpenStackTrustedComputePool2.png"
+                                fileref="../../common/figures/OpenStackTrustedComputePool2.png"
                                 format="PNG" contentwidth="6in"/>
                         </imageobject>
                         <imageobject role="html">
                             <imagedata
-                                fileref="figures/OpenStackTrustedComputePool2.png"
+                                fileref="../../common/figures/OpenStackTrustedComputePool2.png"
                                 format="PNG" contentwidth="6in"/>
                         </imageobject>
                     </mediaobject>

doc/common/ch_getstart.xml

@@ -203,6 +203,7 @@
         <xi:include href="section_getstart_image.xml"/>
         <xi:include href="section_getstart_telemetry.xml"/>
         <xi:include href="section_getstart_orchestration.xml"/>
+        <xi:include href="section_getstart_trove.xml"/>
     </section>
     <section xml:id="feedback">
         <title>Feedback</title>

doc/config-reference/ch_computeconfigure.xml

@@ -84,7 +84,7 @@
   <!-- End of configuring resize -->
   <xi:include href="compute/section_compute-configure-db.xml"/>
   <!-- Oslo rpc mechanism (such as, Rabbit, Qpid, ZeroMQ) -->
-  <xi:include href="../common/section_rpc.xml"/>
+  <xi:include href="compute/section_rpc.xml"/>
   <xi:include href="../common/section_compute_config-api.xml"/>
   <xi:include href="../common/section_compute-configure-ec2.xml"/>
   <xi:include href="../common/section_fibrechannel.xml"/>

doc/config-reference/compute/section_compute-configure-console.xml

@@ -1,16 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  version="5.0"
-  xml:id="section_compute-configure-console">
-    <title>Configure remote console access</title>
-    <!--<?dbhtml stop-chunking?>-->
-    <para>OpenStack has two main methods for providing a remote
-        console or remote desktop access to guest Virtual
-        Machines. They are VNC, and SPICE HTML5 and can be used
-        either through the OpenStack dashboard and the command
-        line. Best practice is to select one or the other to
-        run.</para>
-<xi:include href="../../common/section_compute-configure-vnc.xml"/>
-<xi:include href="../../common/section_compute-configure-spice.xml"/>
-</section>

doc/config-reference/compute/section_introduction-to-xen.xml

@@ -256,6 +256,6 @@
                 </listitem>
             </itemizedlist></para>
     </section>
-    <xi:include href="../../common/section_xen-install.xml"/>
+    <xi:include href="section_xen-install.xml"/>
     <xi:include href="section_compute-configure-xen.xml"/>
 </section>

doc/config-reference/compute/section_rpc.xml

@@ -33,8 +33,8 @@
         <filename>nova.conf</filename> file. The default for sending
       usage data is sixty seconds plus a random number of seconds from
       zero to sixty.</para>
-    <xi:include href="tables/nova-rabbitmq.xml"/>
-    <xi:include href="tables/nova-kombu.xml"/>
+    <xi:include href="../../common/tables/nova-rabbitmq.xml"/>
+    <xi:include href="../../common/tables/nova-kombu.xml"/>
   </section>
   <section xml:id="configuration-qpid">
     <title>Configure Qpid</title>
@@ -70,7 +70,7 @@ qpid_password=password</programlisting>
     <para>This table lists additional options that you use to
       configure the Qpid messaging driver for OpenStack Oslo RPC.
       These options are used infrequently.</para>
-    <xi:include href="tables/nova-qpid.xml"/>
+    <xi:include href="../../common/tables/nova-qpid.xml"/>
   </section>
   <section xml:id="configuration-zeromq">
     <title>Configure ZeroMQ</title>
@@ -80,13 +80,13 @@ qpid_password=password</programlisting>
       default messaging system, so you must enable it by setting the
         <option>rpc_backend</option> option in the
         <filename>nova.conf</filename> file.</para>
-    <xi:include href="tables/nova-zeromq.xml"/>
+    <xi:include href="../../common/tables/nova-zeromq.xml"/>
   </section>
   <section xml:id="common-messaging-configuration">
     <title>Configure messaging</title>
     <para>Use these options to configure the
         <application>RabbitMQ</application> and
         <application>Qpid</application> messaging drivers.</para>
-    <xi:include href="tables/nova-rpc.xml"/>
+    <xi:include href="../../common/tables/nova-rpc.xml"/>
   </section>
 </section>

doc/config-reference/networking/section_networking-options-reference.xml

@@ -14,7 +14,7 @@
 
 <xi:include href="section_networking-plugins.xml"/>
 
-<xi:include href="../../common/section_rpc-for-networking.xml"/>
+<xi:include href="section_rpc-for-networking.xml"/>
 
 <section xml:id="networking-options-agent">
 <title>Agent</title>

doc/config-reference/networking/section_rpc-for-networking.xml

@@ -40,7 +40,7 @@ rpc_backend=neutron.openstack.common.rpc.impl_kombu
       must set the <option>notification_driver</option> option to
         <literal>neutron.notifier.rabbit_notifier</literal> in the
         <filename>neutron.conf</filename> file:</para>
-    <xi:include href="tables/neutron-rabbitmq.xml"/>
+    <xi:include href="../../common/tables/neutron-rabbitmq.xml"/>
   </section>
   <section xml:id="networking-configuration-qpid">
     <title>Configure Qpid</title>
@@ -95,7 +95,7 @@ qpid_protocol=ssl
       driver for OpenStack Oslo RPC. These options are used
       infrequently.</para>
 
-    <xi:include href="tables/neutron-qpid.xml"/>
+    <xi:include href="../../common/tables/neutron-qpid.xml"/>
 
   </section>
   <section xml:id="networking-configuration-zeromq">
@@ -106,7 +106,7 @@ qpid_protocol=ssl
       default messaging system, so you must enable it by setting the
         <option>rpc_backend</option> option in the
         <filename>neutron.conf</filename> file:</para>
-    <xi:include href="tables/neutron-zeromq.xml"/>
+    <xi:include href="../../common/tables/neutron-zeromq.xml"/>
   </section>
   <section xml:id="networking-common-messaging-configuration">
     <title>Configure messaging</title>
@@ -116,8 +116,8 @@ qpid_protocol=ssl
         <application>Qpid</application>, and
         <application>ZeroMq</application> messaging drivers:</para>
 
-    <xi:include href="tables/neutron-rpc.xml"/>
-    <xi:include href="tables/neutron-notifier.xml"/>
-    <xi:include href="tables/neutron-redis.xml"/>
+    <xi:include href="../../common/tables/neutron-rpc.xml"/>
+    <xi:include href="../../common/tables/neutron-notifier.xml"/>
+    <xi:include href="../../common/tables/neutron-redis.xml"/>
   </section>
 </section>

doc/user-guide-admin/section_cli_manage_services.xml

@@ -6,7 +6,7 @@
   xml:id="section_cli_manage_services">
     <?dbhtml stop-chunking?>
     <title>Manage services</title>
-    <xi:include href="../common/section_cli_keystone_services.xml"/>
+    <xi:include href="section_cli_keystone_services.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_cli_nova_services.xml"/>
 </section>

doc/user-guide/ch_cli.xml

@@ -21,11 +21,11 @@
     <?hard-pagebreak?>
     <xi:include href="section_cli_nova_configure_instances.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../common/section_cli_nova_boot.xml"/>
+    <xi:include href="section_cli_nova_boot.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_cli_nova_manage_instances.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../common/section_cli_nova_userdata.xml"/>
+    <xi:include href="section_cli_nova_userdata.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_cli_nova_migrate_instances.xml"/>
     <?hard-pagebreak?>

doc/user-guide/section_cli_nova_boot.xml

@@ -292,5 +292,5 @@
         </note>
     </section>
     <?hard-pagebreak?>
-    <xi:include href="section_cli_nova_boot_from_volume.xml"/>
+    <xi:include href="../common/section_cli_nova_boot_from_volume.xml"/>
 </section>

doc/user-guide/section_cli_nova_config-drive.xml

@@ -244,10 +244,4 @@ openstack/latest/user_data</computeroutput></screen>
                 64&nbsp;MB.</para>
         </simplesect>
     </section>
-    <section xml:id="config_reference">
-        <title>Configuration drive reference</title>
-        <para>The following table shows the configuration options for the
-            configuration drive.</para>
-        <xi:include href="../common/tables/nova-configdrive.xml"/>
-    </section>
 </section>

doc/user-guide/section_cli_nova_manage_instances.xml

@@ -15,12 +15,12 @@
         instances. This section also discusses node management
         tasks.</para>
     <xi:include href="section_cli_nova_floating_ips.xml"/>
-    <xi:include href="../common/section_cli_nova_resizerebuild.xml"/>
-    <xi:include href="../common/section_cli_nova_search_ip.xml"/>
-    <xi:include href="../common/section_cli_nova_startstop.xml"/>
-    <xi:include href="../common/section_cli_nova_reboot.xml"/>
-    <xi:include href="../common/section_cli_nova_terminate.xml"/>
-    <xi:include href="../common/section_cli_nova_get_console.xml"/>
-    <xi:include href="../common/section_cli_nova_baremetal.xml"/>
+    <xi:include href="section_cli_nova_resizerebuild.xml"/>
+    <xi:include href="section_cli_nova_search_ip.xml"/>
+    <xi:include href="section_cli_nova_startstop.xml"/>
+    <xi:include href="section_cli_nova_reboot.xml"/>
+    <xi:include href="section_cli_nova_terminate.xml"/>
+    <xi:include href="section_cli_nova_get_console.xml"/>
+    <xi:include href="section_cli_nova_baremetal.xml"/>
     <xi:include href="../common/section_cli_nova_usage_statistics.xml"/>
 </section>