Bug # 1172337 - Consolidated common files to "common" directory.

Consolidated XML files, and their dependencies, used by both the install and
compute admin guides in the "common" folder. Where a file was identified
as being used by only one of the two guides it was moved to that guide.

Change-Id: I2b6a8e711f08883a1565d671b8292c9ce5778237
This commit is contained in:
Stephen Gordon
2013-04-26 16:26:42 -04:00
parent ada0648e87
commit 05bc917b8e
11 changed files with 6 additions and 6 deletions

View File

@@ -24,7 +24,7 @@
<xi:include href="tables/ldap-nova-conf.xml"/>
<xi:include href="tables/roles-auth-nova-conf.xml" />
<xi:include href="tables/nova-ec2-nova-conf.xml" />
<xi:include href="tables/vnc-guests-nova-conf.xml" />
<xi:include href="../common/tables/vnc-guests-nova-conf.xml" />
<xi:include href="tables/spice-guests-nova-conf.xml" />
<xi:include href="tables/network-nova-conf.xml" />
<xi:include href="tables/live-migration-nova-conf.xml"/>

View File

@@ -12,6 +12,6 @@
either through the OpenStack dashboard and the command
line. Best practice is to select one or the other to
run.</para>
<xi:include href="compute-vnc-console.xml"/>
<xi:include href="../common/compute-vnc-console.xml"/>
<xi:include href="compute-spice-console.xml"/>
</section>
</section>

View File

@@ -27,5 +27,5 @@
<xi:include href="../common/dashboard-verify.xml"/>
<xi:include href="../common/dashboard_customizing.xml" />
<xi:include href="../common/dashboard_sessions.xml" />
<xi:include href="../openstack-compute-admin/compute-vnc-console.xml"/>
<xi:include href="../common/compute-vnc-console.xml"/>
</chapter>

View File

@@ -4,6 +4,6 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"><title>Installing and Configuring Volumes for Compute</title>
<note><para>For additional information about managing volumes including troubleshooting, refer to the OpenStack Compute Administration Guide.</para></note>
<xi:include href="../openstack-compute-admin/install-nova-volume.xml" />
<xi:include href="../openstack-compute-admin/configure-nova-volume.xml" />
<xi:include href="install-nova-volume.xml" />
<xi:include href="configure-nova-volume.xml" />
</section>