From dfbc20accc8209127eb32409e36b961aa6682db9 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Tue, 29 Oct 2013 17:30:29 +1100 Subject: [PATCH] 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 --- .../compute/section_compute-hypervisors.xml | 16 ++++++++-------- .../compute/section_hypervisor_baremetal.xml} | 2 +- .../compute/section_hypervisor_docker.xml} | 2 +- .../compute/section_hypervisor_hyper-v.xml} | 2 +- .../compute/section_hypervisor_kvm.xml} | 2 +- .../compute/section_hypervisor_lxc.xml} | 0 .../compute/section_hypervisor_powervm.xml} | 2 +- .../compute/section_hypervisor_qemu.xml} | 0 .../compute/section_hypervisor_vmware.xml} | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename doc/{common/section_baremetal.xml => config-reference/compute/section_hypervisor_baremetal.xml} (97%) rename doc/{common/section_docker.xml => config-reference/compute/section_hypervisor_docker.xml} (97%) rename doc/{common/section_hyper-v.xml => config-reference/compute/section_hypervisor_hyper-v.xml} (99%) rename doc/{common/section_kvm.xml => config-reference/compute/section_hypervisor_kvm.xml} (99%) rename doc/{common/section_lxc.xml => config-reference/compute/section_hypervisor_lxc.xml} (100%) rename doc/{common/section_powervm.xml => config-reference/compute/section_hypervisor_powervm.xml} (97%) rename doc/{common/section_qemu.xml => config-reference/compute/section_hypervisor_qemu.xml} (100%) rename doc/{common/section_vmware.xml => config-reference/compute/section_hypervisor_vmware.xml} (99%) diff --git a/doc/config-reference/compute/section_compute-hypervisors.xml b/doc/config-reference/compute/section_compute-hypervisors.xml index 4121914b3b..6263d8b477 100644 --- a/doc/config-reference/compute/section_compute-hypervisors.xml +++ b/doc/config-reference/compute/section_compute-hypervisors.xml @@ -113,13 +113,13 @@ can be found in following sections. - - + + - - - - - - + + + + + + diff --git a/doc/common/section_baremetal.xml b/doc/config-reference/compute/section_hypervisor_baremetal.xml similarity index 97% rename from doc/common/section_baremetal.xml rename to doc/config-reference/compute/section_hypervisor_baremetal.xml index 2b0a362586..3e428e6523 100644 --- a/doc/common/section_baremetal.xml +++ b/doc/config-reference/compute/section_hypervisor_baremetal.xml @@ -45,5 +45,5 @@ reserved_host_memory_mb=0 xlink:href="https://wiki.openstack.org/wiki/Baremetal"> main wiki page for details and implementation suggestions. - + diff --git a/doc/common/section_docker.xml b/doc/config-reference/compute/section_hypervisor_docker.xml similarity index 97% rename from doc/common/section_docker.xml rename to doc/config-reference/compute/section_hypervisor_docker.xml index fcf7bf2630..1bca9e5869 100644 --- a/doc/common/section_docker.xml +++ b/doc/config-reference/compute/section_hypervisor_docker.xml @@ -37,5 +37,5 @@ xml:id="docker"> Glance also needs to be configured to support the Docker container format, in /etc/glance-api.conf: container_formats = ami,ari,aki,bare,ovf,docker - + diff --git a/doc/common/section_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml similarity index 99% rename from doc/common/section_hyper-v.xml rename to doc/config-reference/compute/section_hypervisor_hyper-v.xml index db5b528d94..59345c508f 100644 --- a/doc/common/section_hyper-v.xml +++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml @@ -344,7 +344,7 @@ volume_api_class=nova.volume.cinder.API [database] connection=mysql://nova:passwd@IP_ADDRESS/nova The following table contains a reference of all optionsfor hyper-v - +
Preparing Images for use with Hyper-V diff --git a/doc/common/section_kvm.xml b/doc/config-reference/compute/section_hypervisor_kvm.xml similarity index 99% rename from doc/common/section_kvm.xml rename to doc/config-reference/compute/section_hypervisor_kvm.xml index a90d87498c..95a5568556 100644 --- a/doc/common/section_kvm.xml +++ b/doc/config-reference/compute/section_hypervisor_kvm.xml @@ -86,7 +86,7 @@ libvirt_type=kvm - +
Specify the CPU model of KVM guests diff --git a/doc/common/section_lxc.xml b/doc/config-reference/compute/section_hypervisor_lxc.xml similarity index 100% rename from doc/common/section_lxc.xml rename to doc/config-reference/compute/section_hypervisor_lxc.xml diff --git a/doc/common/section_powervm.xml b/doc/config-reference/compute/section_hypervisor_powervm.xml similarity index 97% rename from doc/common/section_powervm.xml rename to doc/config-reference/compute/section_hypervisor_powervm.xml index 3412110fff..4bdaf5aa73 100644 --- a/doc/common/section_powervm.xml +++ b/doc/config-reference/compute/section_hypervisor_powervm.xml @@ -29,7 +29,7 @@ powervm_mgr_passwd=padmin_user_password powervm_img_remote_path=/path/to/remote/image/directory powervm_img_local_path=/path/to/local/image/directory/on/compute/host - +
Limitations diff --git a/doc/common/section_qemu.xml b/doc/config-reference/compute/section_hypervisor_qemu.xml similarity index 100% rename from doc/common/section_qemu.xml rename to doc/config-reference/compute/section_hypervisor_qemu.xml diff --git a/doc/common/section_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml similarity index 99% rename from doc/common/section_vmware.xml rename to doc/config-reference/compute/section_hypervisor_vmware.xml index 310c9c8fac..193d9cec64 100644 --- a/doc/common/section_vmware.xml +++ b/doc/config-reference/compute/section_hypervisor_vmware.xml @@ -277,6 +277,6 @@ is_public=true --property vmware_adaptertype="ide" \
Configuration Reference - +