Move hypervisor sections out of common
The purpose for common is to host files that are used in multiple guides. These files were only in use in the configuration reference. In addition, the content and structure of these files was not very conducive to sharing between guides. Therefore, this patch simply moves the hypervisor sections from common into the compute area of the config-reference. Should (in the future) some content from these be required in - eg Install Guide or Cloud Admin Guide, it is likely best that they are chopped apart with appropriate sections divided appropriately. backport: havana Change-Id: Ie153ccf810de2dccd32cb7b6ee3076fbac365605
This commit is contained in:
parent
0e9f2c421a
commit
dfbc20accc
@ -113,13 +113,13 @@
|
|||||||
can be found in following sections.</para>
|
can be found in following sections.</para>
|
||||||
<xi:include href="../../common/tables/nova-hypervisor.xml"/>
|
<xi:include href="../../common/tables/nova-hypervisor.xml"/>
|
||||||
</section>
|
</section>
|
||||||
<xi:include href="../../common/section_kvm.xml"/>
|
<xi:include href="section_hypervisor_kvm.xml"/>
|
||||||
<xi:include href="../../common/section_qemu.xml"/>
|
<xi:include href="section_hypervisor_qemu.xml"/>
|
||||||
<xi:include href="section_introduction-to-xen.xml"/>
|
<xi:include href="section_introduction-to-xen.xml"/>
|
||||||
<xi:include href="../../common/section_lxc.xml"/>
|
<xi:include href="section_hypervisor_lxc.xml"/>
|
||||||
<xi:include href="../../common/section_vmware.xml"/>
|
<xi:include href="section_hypervisor_vmware.xml"/>
|
||||||
<xi:include href="../../common/section_powervm.xml"/>
|
<xi:include href="section_hypervisor_powervm.xml"/>
|
||||||
<xi:include href="../../common/section_hyper-v.xml"/>
|
<xi:include href="section_hypervisor_hyper-v.xml"/>
|
||||||
<xi:include href="../../common/section_baremetal.xml"/>
|
<xi:include href="section_hypervisor_baremetal.xml"/>
|
||||||
<xi:include href="../../common/section_docker.xml"/>
|
<xi:include href="section_hypervisor_docker.xml"/>
|
||||||
</section>
|
</section>
|
||||||
|
@ -45,5 +45,5 @@ reserved_host_memory_mb=0</programlisting>
|
|||||||
xlink:href="https://wiki.openstack.org/wiki/Baremetal">
|
xlink:href="https://wiki.openstack.org/wiki/Baremetal">
|
||||||
main wiki page</link> for details and implementation suggestions.
|
main wiki page</link> for details and implementation suggestions.
|
||||||
</para>
|
</para>
|
||||||
<xi:include href="tables/nova-baremetal.xml"/>
|
<xi:include href="../../common/tables/nova-baremetal.xml"/>
|
||||||
</section>
|
</section>
|
@ -37,5 +37,5 @@ xml:id="docker">
|
|||||||
<para>Glance also needs to be configured to support the Docker container format, in
|
<para>Glance also needs to be configured to support the Docker container format, in
|
||||||
<filename>/etc/glance-api.conf</filename>:
|
<filename>/etc/glance-api.conf</filename>:
|
||||||
<programlisting language="ini">container_formats = ami,ari,aki,bare,ovf,docker</programlisting></para>
|
<programlisting language="ini">container_formats = ami,ari,aki,bare,ovf,docker</programlisting></para>
|
||||||
<xi:include href="tables/nova-docker.xml"/>
|
<xi:include href="../../common/tables/nova-docker.xml"/>
|
||||||
</section>
|
</section>
|
@ -344,7 +344,7 @@ volume_api_class=nova.volume.cinder.API
|
|||||||
[database]
|
[database]
|
||||||
connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</programlisting>
|
connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</programlisting>
|
||||||
<para>The following table contains a reference of all optionsfor hyper-v</para>
|
<para>The following table contains a reference of all optionsfor hyper-v</para>
|
||||||
<xi:include href="tables/nova-hyperv.xml"/>
|
<xi:include href="../../common/tables/nova-hyperv.xml"/>
|
||||||
</section>
|
</section>
|
||||||
<section xml:id="prepare-hyper-v-images">
|
<section xml:id="prepare-hyper-v-images">
|
||||||
<title>Preparing Images for use with Hyper-V</title>
|
<title>Preparing Images for use with Hyper-V</title>
|
@ -86,7 +86,7 @@ libvirt_type=kvm</programlisting>
|
|||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
|
|
||||||
<xi:include href="section_kvm_enable.xml"/>
|
<xi:include href="../../common/section_kvm_enable.xml"/>
|
||||||
|
|
||||||
<section xml:id="libvirt-xml-cpu-model">
|
<section xml:id="libvirt-xml-cpu-model">
|
||||||
<title>Specify the CPU model of KVM guests</title>
|
<title>Specify the CPU model of KVM guests</title>
|
@ -29,7 +29,7 @@ powervm_mgr_passwd=padmin_user_password
|
|||||||
powervm_img_remote_path=/path/to/remote/image/directory
|
powervm_img_remote_path=/path/to/remote/image/directory
|
||||||
powervm_img_local_path=/path/to/local/image/directory/on/compute/host</programlisting>
|
powervm_img_local_path=/path/to/local/image/directory/on/compute/host</programlisting>
|
||||||
</para>
|
</para>
|
||||||
<xi:include href="tables/nova-powervm.xml"/>
|
<xi:include href="../../common/tables/nova-powervm.xml"/>
|
||||||
</section>
|
</section>
|
||||||
<section xml:id="powervm-limits">
|
<section xml:id="powervm-limits">
|
||||||
<title>Limitations</title>
|
<title>Limitations</title>
|
@ -277,6 +277,6 @@ is_public=true --property vmware_adaptertype="ide" \
|
|||||||
</section>
|
</section>
|
||||||
<section xml:id="VMWare_config">
|
<section xml:id="VMWare_config">
|
||||||
<title>Configuration Reference</title>
|
<title>Configuration Reference</title>
|
||||||
<xi:include href="tables/nova-vmware.xml"/>
|
<xi:include href="../../common/tables/nova-vmware.xml"/>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
Loading…
Reference in New Issue
Block a user