You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/10/11 03:01:35 UTC
[32/67] [abbrv] [partial] Removing docs from master
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/host-allocation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-allocation.xml b/docs/en-US/host-allocation.xml
deleted file mode 100644
index dddffd5..0000000
--- a/docs/en-US/host-allocation.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="host-allocation">
- <title>Assigning VMs to Hosts</title>
- <para>At any point in time, each virtual machine instance is running on a single host.
- How does &PRODUCT; determine which host to place a VM on? There are several ways:</para>
- <itemizedlist>
- <listitem><para>Automatic default host allocation. &PRODUCT; can automatically pick
- the most appropriate host to run each virtual machine.</para></listitem>
- <listitem><para>Instance type preferences. &PRODUCT; administrators can specify that certain hosts should have a preference for particular types of guest instances.
- For example, an administrator could state that a host should have a preference to run Windows guests.
- The default host allocator will attempt to place guests of that OS type on such hosts first.
- If no such host is available, the allocator will place the instance wherever there is sufficient physical capacity.</para></listitem>
- <listitem><para>Vertical and horizontal allocation.
- Vertical allocation consumes all the resources of a given host before allocating any guests on a second host.
- This reduces power consumption in the cloud. Horizontal allocation places a guest on each host in a round-robin fashion.
- This may yield better performance to the guests in some cases.</para></listitem>
- <listitem><para>End user preferences.
- Users can not control exactly which host will run a given VM instance,
- but they can specify a zone for the VM.
- &PRODUCT; is then restricted to allocating the VM only to one of the hosts in that zone.</para></listitem>
- <listitem><para>Host tags. The administrator can assign tags to hosts. These tags can be used to
- specify which host a VM should use.
- The &PRODUCT; administrator decides whether to define host tags, then create a service offering using those tags and offer it to the user.
- </para></listitem>
- <listitem><para>Affinity groups.
- By defining affinity groups and assigning VMs to them, the user or administrator can
- influence (but not dictate) which VMs should run on separate hosts.
- This feature is to let users specify that certain VMs won't be on the same host.</para></listitem>
- <listitem><para>&PRODUCT; also provides a pluggable interface for adding new allocators.
- These custom allocators can provide any policy the administrator desires.</para></listitem>
- </itemizedlist>
- <section id="affinity-groups">
- <title>Affinity Groups</title>
- <para>By defining affinity groups and assigning VMs to them, the user or administrator can
- influence (but not dictate) which VMs should run on separate hosts.
- This feature is to let users specify that VMs with the same “host anti-affinity” type won’t be on the same host.
- This serves to increase fault tolerance.
- If a host fails, another VM offering the same service (for example, hosting the user's website) is still up and running on another host.</para>
- <para>The scope of an affinity group is per user account.</para>
- <formalpara><title>Creating a New Affinity Group</title>
- <para>To add an affinity group:</para></formalpara>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
- <listitem><para>In the left navigation bar, click Affinity Groups.</para></listitem>
- <listitem><para>Click Add affinity group. In the dialog box, fill in the following fields:</para>
- <itemizedlist>
- <listitem><para>Name. Give the group a name.</para></listitem>
- <listitem><para>Description. Any desired text to tell more about the purpose of the group.</para></listitem>
- <listitem><para>Type. The only supported type shipped with &PRODUCT; is Host Anti-Affinity.
- This indicates that the VMs in this group should avoid being placed on the same VM with each other.
- If you see other types in this list, it means that your installation of &PRODUCT; has been extended
- with customized affinity group plugins.</para></listitem>
- </itemizedlist>
- </listitem>
- </orderedlist>
- <formalpara><title>Assign a New VM to an Affinity Group</title>
- <para>To assign a new VM to an affinity group:</para></formalpara>
- <itemizedlist>
- <listitem><para>Create the VM as usual, as described in <xref linkend="creating-vms"/>.
- In the Add Instance wizard, there is a new Affinity tab where you can select the affinity group.</para></listitem>
- </itemizedlist>
- <formalpara><title>Change Affinity Group for an Existing VM</title>
- <para>To assign an existing VM to an affinity group:</para></formalpara>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
- <listitem><para>In the left navigation bar, click Instances.</para></listitem>
- <listitem><para>Click the name of the VM you want to work with.</para></listitem>
- <listitem><para>Stop the VM by clicking the Stop button.</para></listitem>
- <listitem><para>Click the Change Affinity button. <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/change-affinity-button.png"/>
- </imageobject>
- <textobject>
- <phrase>change-affinity-button.png: button to assign an affinity group
- to a virtual machine</phrase>
- </textobject>
- </inlinemediaobject>
- </para></listitem>
- </orderedlist>
- <formalpara><title>View Members of an Affinity Group</title>
- <para>To see which VMs are currently assigned to a particular affinity group:</para></formalpara>
- <orderedlist>
- <listitem><para>In the left navigation bar, click Affinity Groups.</para></listitem>
- <listitem><para>Click the name of the group you are interested in.</para></listitem>
- <listitem><para>Click View Instances. The members of the group are listed.</para>
- <para>From here, you can click the name of any VM in the list to access all its details and controls.</para></listitem>
- </orderedlist>
- <formalpara><title>Delete an Affinity Group</title>
- <para>To delete an affinity group:</para></formalpara>
- <orderedlist>
- <listitem><para>In the left navigation bar, click Affinity Groups.</para></listitem>
- <listitem><para>Click the name of the group you are interested in.</para></listitem>
- <listitem><para>Click Delete.</para>
- <para>Any VM that is a member of the affinity group will be disassociated from the group.
- The former group members will continue to run normally on the current hosts, but if the
- VM is restarted, it will no longer follow the host allocation rules from its former
- affinity group.</para></listitem>
- </orderedlist>
- </section>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-agent.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-agent.xml b/docs/en-US/hypervisor-host-install-agent.xml
deleted file mode 100644
index e339165..0000000
--- a/docs/en-US/hypervisor-host-install-agent.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-agent">
- <title>Install and configure the Agent</title>
- <para>To manage KVM instances on the host &PRODUCT; uses a Agent. This Agent communicates with the Management server and controls all the instances on the host.</para>
- <para>First we start by installing the agent:</para>
- <para>In RHEL or CentOS:</para>
- <programlisting language="Bash"><command>$ yum install cloudstack-agent</command></programlisting>
- <para>In Ubuntu:</para>
- <programlisting language="Bash"><command>$ apt-get install cloudstack-agent</command></programlisting>
- <para>The host is now ready to be added to a cluster. This is covered in a later section, see <xref linkend="host-add" />. It is recommended that you continue to read the documentation before adding the host!</para>
- <section id="config-cpu-model">
- <title>Configure CPU model for KVM guest (Optional) </title>
- <para>In additional,the &PRODUCT; Agent allows host administrator to control the guest CPU model which is exposed to KVM instances. By default, the CPU model of KVM instance is likely <emphasis role="italic"> QEMU Virtual CPU version x.x.x</emphasis> with least CPU features exposed. There are a couple of reasons to specify the CPU model:</para>
- <itemizedlist>
- <listitem><para>To maximise performance of instances by exposing new host CPU features to the KVM instances;</para> </listitem>
- <listitem><para>To ensure a consistent default CPU across all machines,removing reliance of variable QEMU defaults; </para> </listitem>
- </itemizedlist>
- <para> For the most part it will be sufficient for the host administrator to specify the guest CPU config in the per-host configuration file (/etc/cloudstack/agent/agent.properties). This will be achieved by introducing two new configuration parameters: </para>
- <programlisting language="Bash">guest.cpu.mode=custom|host-model|host-passthrough
-guest.cpu.model=from /usr/share/libvirt/cpu_map.xml(only valid when guest.cpu.mode=custom)
- </programlisting>
- <para>There are three choices to fulfill the cpu model changes:</para>
- <orderedlist>
- <listitem>
- <para><emphasis role="bold">custom: </emphasis> you can explicitly specify one of the supported named model in /usr/share/libvirt/cpu_map.xml</para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">host-model: </emphasis> libvirt will identify the CPU model in /usr/share/libvirt/cpu_map.xml which most closely matches the host, and then request additional CPU flags to complete the match. This should give close to maximum functionality/performance, which maintaining good reliability/compatibility if the guest is migrated to another host with slightly different host CPUs. </para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">host-passthrough: </emphasis> libvirt will tell KVM to passthrough the host CPU with no modifications. The difference to host-model, instead of just matching feature flags, every last detail of the host CPU is matched. This gives absolutely best performance, and can be important to some apps which check low level CPU details, but it comes at a cost with respect to migration: the guest can only be migrated to an exactly matching host CPU. </para>
- </listitem>
- </orderedlist>
- <para>Here are some examples:</para>
- <itemizedlist>
- <listitem>
- <para>custom</para>
- <programlisting>guest.cpu.mode=custom
-guest.cpu.model=SandyBridge
- </programlisting>
- </listitem>
- <listitem>
- <para>host-model</para>
- <programlisting>guest.cpu.mode=host-model </programlisting>
- </listitem>
- <listitem>
- <para>host-passthrough</para>
- <programlisting>guest.cpu.mode=host-passthrough </programlisting>
- </listitem>
- </itemizedlist>
- <note>
- <para>host-passthrough may lead to migration failure,if you have this problem,you should use host-model or custom </para>
- </note>
-</section>
-
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-finish.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-finish.xml b/docs/en-US/hypervisor-host-install-finish.xml
deleted file mode 100644
index ff530c7..0000000
--- a/docs/en-US/hypervisor-host-install-finish.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-finish">
- <title>Add the host to CloudStack</title>
- <para>The host is now ready to be added to a cluster. This is covered in a later section, see <xref linkend="host-add" />. It is recommended that you continue to read the documentation before adding the host!</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-firewall.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-firewall.xml b/docs/en-US/hypervisor-host-install-firewall.xml
deleted file mode 100644
index c665873..0000000
--- a/docs/en-US/hypervisor-host-install-firewall.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-firewall">
- <title>Configuring the firewall</title>
- <para>The hypervisor needs to be able to communicate with other hypervisors and the management server needs to be able to reach the hypervisor.</para>
- <para>In order to do so we have to open the following TCP ports (if you are using a firewall):</para>
- <orderedlist>
- <listitem><para>22 (SSH)</para></listitem>
- <listitem><para>1798</para></listitem>
- <listitem><para>16509 (libvirt)</para></listitem>
- <listitem><para>5900 - 6100 (VNC consoles)</para></listitem>
- <listitem><para>49152 - 49216 (libvirt live migration)</para></listitem>
- </orderedlist>
- <para>It depends on the firewall you are using how to open these ports. Below you'll find examples how to open these ports in RHEL/CentOS and Ubuntu.</para>
- <section>
- <title>Open ports in RHEL/CentOS</title>
- <para>RHEL and CentOS use iptables for firewalling the system, you can open extra ports by executing the following iptable commands:</para>
- <programlisting language="Bash"><command>$ iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT</command></programlisting>
- <programlisting language="Bash"><command>$ iptables -I INPUT -p tcp -m tcp --dport 1798 -j ACCEPT</command></programlisting>
- <programlisting language="Bash"><command>$ iptables -I INPUT -p tcp -m tcp --dport 16509 -j ACCEPT</command></programlisting>
- <programlisting language="Bash"><command>$ iptables -I INPUT -p tcp -m tcp --dport 5900:6100 -j ACCEPT</command></programlisting>
- <programlisting language="Bash"><command>$ iptables -I INPUT -p tcp -m tcp --dport 49152:49216 -j ACCEPT</command></programlisting>
- <para>These iptable settings are not persistent accross reboots, we have to save them first.</para>
- <programlisting language="Bash"><command>$ iptables-save > /etc/sysconfig/iptables</command></programlisting>
- </section>
- <section>
- <title>Open ports in Ubuntu</title>
- <para>The default firewall under Ubuntu is UFW (Uncomplicated FireWall), which is a Python wrapper around iptables.</para>
- <para>To open the required ports, execute the following commands:</para>
- <programlisting language="Bash"><command>$ ufw allow proto tcp from any to any port 22</command></programlisting>
- <programlisting language="Bash"><command>$ ufw allow proto tcp from any to any port 1798</command></programlisting>
- <programlisting language="Bash"><command>$ ufw allow proto tcp from any to any port 16509</command></programlisting>
- <programlisting language="Bash"><command>$ ufw allow proto tcp from any to any port 5900:6100</command></programlisting>
- <programlisting language="Bash"><command>$ ufw allow proto tcp from any to any port 49152:49216</command></programlisting>
- <note><para>By default UFW is not enabled on Ubuntu. Executing these commands with the firewall disabled does not enable the firewall.</para></note>
- </section>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-libvirt.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-libvirt.xml b/docs/en-US/hypervisor-host-install-libvirt.xml
deleted file mode 100644
index d3d6b9b..0000000
--- a/docs/en-US/hypervisor-host-install-libvirt.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-libvirt">
- <title>Install and Configure libvirt</title>
- <para>&PRODUCT; uses libvirt for managing virtual machines. Therefore it is vital that libvirt is configured correctly. Libvirt is a dependency of cloudstack-agent and should already be installed.</para>
- <orderedlist>
- <listitem>
- <para>In order to have live migration working libvirt has to listen for unsecured TCP connections. We also need to turn off libvirts attempt to use Multicast DNS advertising. Both of these settings are in <filename>/etc/libvirt/libvirtd.conf</filename></para>
- <para>Set the following parameters:</para>
- <programlisting>listen_tls = 0</programlisting>
- <programlisting>listen_tcp = 1</programlisting>
- <programlisting>tcp_port = "16509"</programlisting>
- <programlisting>auth_tcp = "none"</programlisting>
- <programlisting>mdns_adv = 0</programlisting>
- </listitem>
- <listitem>
- <para>Turning on "listen_tcp" in libvirtd.conf is not enough, we have to change the parameters as well:</para>
- <para>On RHEL or CentOS modify <filename>/etc/sysconfig/libvirtd</filename>:</para>
- <para>Uncomment the following line:</para>
- <programlisting>#LIBVIRTD_ARGS="--listen"</programlisting>
- <para>On Ubuntu: modify <filename>/etc/default/libvirt-bin</filename></para>
- <para>Add "-l" to the following line::</para>
- <programlisting>libvirtd_opts="-d"</programlisting>
- <para>so it looks like:</para>
- <programlisting>libvirtd_opts="-d -l"</programlisting>
- </listitem>
- <listitem>
- <para>Restart libvirt</para>
- <para>In RHEL or CentOS:</para>
- <programlisting><command>$ service libvirtd restart</command></programlisting>
- <para>In Ubuntu:</para>
- <programlisting><command>$ service libvirt-bin restart</command></programlisting>
- </listitem>
- </orderedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-network-openvswitch.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-network-openvswitch.xml b/docs/en-US/hypervisor-host-install-network-openvswitch.xml
deleted file mode 100644
index a16dc8e..0000000
--- a/docs/en-US/hypervisor-host-install-network-openvswitch.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-network-openvswitch">
- <title>Configure the network using OpenVswitch</title>
- <warning><para>This is a very important section, please make sure you read this thoroughly.</para></warning>
- <para>In order to forward traffic to your instances you will need at least two bridges: <emphasis>public</emphasis> and <emphasis>private</emphasis>.</para>
- <para>By default these bridges are called <emphasis>cloudbr0</emphasis> and <emphasis>cloudbr1</emphasis>, but you do have to make sure they are available on each hypervisor.</para>
- <para>The most important factor is that you keep the configuration consistent on all your hypervisors.</para>
- <section id="hypervisor-host-install-network-openvswitch-prepare">
- <title>Preparing</title>
- <para>To make sure that the native bridge module will not interfere with openvswitch the bridge module should be added to the blacklist. See the modprobe documentation for your distribution on where to find the blacklist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps.</para>
- <para>The network configurations below depend on the ifup-ovs and ifdown-ovs scripts which are part of the openvswitch installation. They should be installed in /etc/sysconfig/network-scripts/</para>
- </section>
- <section id="hypervisor-host-install-network-openvswitch-vlan">
- <title>Network example</title>
- <para>There are many ways to configure your network. In the Basic networking mode you should have two (V)LAN's, one for your private network and one for the public network.</para>
- <para>We assume that the hypervisor has one NIC (eth0) with three tagged VLAN's:</para>
- <orderedlist>
- <listitem><para>VLAN 100 for management of the hypervisor</para></listitem>
- <listitem><para>VLAN 200 for public network of the instances (cloudbr0)</para></listitem>
- <listitem><para>VLAN 300 for private network of the instances (cloudbr1)</para></listitem>
- </orderedlist>
- <para>On VLAN 100 we give the Hypervisor the IP-Address 192.168.42.11/24 with the gateway 192.168.42.1</para>
- <note><para>The Hypervisor and Management server don't have to be in the same subnet!</para></note>
- </section>
- <section id="hypervisor-host-install-network-openvswitch-configure">
- <title>Configuring the network bridges</title>
- <para>It depends on the distribution you are using how to configure these, below you'll find
- examples for RHEL/CentOS.</para>
- <note><para>The goal is to have three bridges called 'mgmt0', 'cloudbr0' and 'cloudbr1' after this
- section. This should be used as a guideline only. The exact configuration will
- depend on your network layout.</para></note>
- <section id="hypervisor-host-install-network-openvswitch-configure-ovs">
- <title>Configure OpenVswitch</title>
- <para>The network interfaces using OpenVswitch are created using the ovs-vsctl command. This command will configure the interfaces and persist them to the OpenVswitch database.</para>
- <para>First we create a main bridge connected to the eth0 interface. Next we create three fake bridges, each connected to a specific vlan tag.</para>
- <programlisting><![CDATA[# ovs-vsctl add-br cloudbr
-# ovs-vsctl add-port cloudbr eth0
-# ovs-vsctl set port cloudbr trunks=100,200,300
-# ovs-vsctl add-br mgmt0 cloudbr 100
-# ovs-vsctl add-br cloudbr0 cloudbr 200
-# ovs-vsctl add-br cloudbr1 cloudbr 300]]></programlisting>
- </section>
- <section id="hypervisor-host-install-network-openvswitch-configure-rhel">
- <title>Configure in RHEL or CentOS</title>
- <para>The required packages were installed when openvswitch and libvirt were installed,
- we can proceed to configuring the network.</para>
- <para>First we configure eth0</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0</programlisting>
- <para>Make sure it looks similar to:</para>
- <programlisting><![CDATA[DEVICE=eth0
-HWADDR=00:04:xx:xx:xx:xx
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=Ethernet]]></programlisting>
- <para>We have to configure the base bridge with the trunk.</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr</programlisting>
- <programlisting><![CDATA[DEVICE=cloudbr
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-DEVICETYPE=ovs
-TYPE=OVSBridge]]></programlisting>
- <para>We now have to configure the three VLAN bridges:</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-mgmt0</programlisting>
- <programlisting><![CDATA[DEVICE=mgmt0
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=static
-DEVICETYPE=ovs
-TYPE=OVSBridge
-IPADDR=192.168.42.11
-GATEWAY=192.168.42.1
-NETMASK=255.255.255.0]]></programlisting>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0</programlisting>
- <programlisting><![CDATA[DEVICE=cloudbr0
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-DEVICETYPE=ovs
-TYPE=OVSBridge]]></programlisting>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr1</programlisting>
- <programlisting><![CDATA[DEVICE=cloudbr1
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=OVSBridge
-DEVICETYPE=ovs]]></programlisting>
- <para>With this configuration you should be able to restart the network, although a reboot is recommended to see if everything works properly.</para>
- <warning><para>Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning!</para></warning>
- </section>
- </section>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-network.xml b/docs/en-US/hypervisor-host-install-network.xml
deleted file mode 100644
index 80156d9..0000000
--- a/docs/en-US/hypervisor-host-install-network.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-network">
- <title>Configure the network bridges</title>
- <warning><para>This is a very important section, please make sure you read this thoroughly.</para></warning>
- <note><para>This section details how to configure bridges using the native implementation in Linux. Please refer to the next section if you intend to use OpenVswitch</para></note>
- <para>In order to forward traffic to your instances you will need at least two bridges: <emphasis>public</emphasis> and <emphasis>private</emphasis>.</para>
- <para>By default these bridges are called <emphasis>cloudbr0</emphasis> and <emphasis>cloudbr1</emphasis>, but you do have to make sure they are available on each hypervisor.</para>
- <para>The most important factor is that you keep the configuration consistent on all your hypervisors.</para>
- <section>
- <title>Network example</title>
- <para>There are many ways to configure your network. In the Basic networking mode you should have two (V)LAN's, one for your private network and one for the public network.</para>
- <para>We assume that the hypervisor has one NIC (eth0) with three tagged VLAN's:</para>
- <orderedlist>
- <listitem><para>VLAN 100 for management of the hypervisor</para></listitem>
- <listitem><para>VLAN 200 for public network of the instances (cloudbr0)</para></listitem>
- <listitem><para>VLAN 300 for private network of the instances (cloudbr1)</para></listitem>
- </orderedlist>
- <para>On VLAN 100 we give the Hypervisor the IP-Address 192.168.42.11/24 with the gateway 192.168.42.1</para>
- <note><para>The Hypervisor and Management server don't have to be in the same subnet!</para></note>
- </section>
- <section>
- <title>Configuring the network bridges</title>
- <para>It depends on the distribution you are using how to configure these, below you'll find examples for RHEL/CentOS and Ubuntu.</para>
- <note><para>The goal is to have two bridges called 'cloudbr0' and 'cloudbr1' after this section. This should be used as a guideline only. The exact configuration will depend on your network layout.</para></note>
- <section>
- <title>Configure in RHEL or CentOS</title>
- <para>The required packages were installed when libvirt was installed, we can proceed to configuring the network.</para>
- <para>First we configure eth0</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0</programlisting>
- <para>Make sure it looks similar to:</para>
- <programlisting><![CDATA[DEVICE=eth0
-HWADDR=00:04:xx:xx:xx:xx
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=Ethernet]]></programlisting>
- <para>We now have to configure the three VLAN interfaces:</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0.100</programlisting>
- <programlisting><![CDATA[DEVICE=eth0.100
-HWADDR=00:04:xx:xx:xx:xx
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=Ethernet
-VLAN=yes
-IPADDR=192.168.42.11
-GATEWAY=192.168.42.1
-NETMASK=255.255.255.0]]></programlisting>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0.200</programlisting>
- <programlisting><![CDATA[DEVICE=eth0.200
-HWADDR=00:04:xx:xx:xx:xx
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=Ethernet
-VLAN=yes
-BRIDGE=cloudbr0]]></programlisting>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0.300</programlisting>
- <programlisting><![CDATA[DEVICE=eth0.300
-HWADDR=00:04:xx:xx:xx:xx
-ONBOOT=yes
-HOTPLUG=no
-BOOTPROTO=none
-TYPE=Ethernet
-VLAN=yes
-BRIDGE=cloudbr1]]></programlisting>
- <para>Now we have the VLAN interfaces configured we can add the bridges on top of them.</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0</programlisting>
- <para>Now we just configure it is a plain bridge without an IP-Address</para>
- <programlisting><![CDATA[DEVICE=cloudbr0
-TYPE=Bridge
-ONBOOT=yes
-BOOTPROTO=none
-IPV6INIT=no
-IPV6_AUTOCONF=no
-DELAY=5
-STP=yes]]></programlisting>
- <para>We do the same for cloudbr1</para>
- <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr1</programlisting>
- <programlisting><![CDATA[DEVICE=cloudbr1
-TYPE=Bridge
-ONBOOT=yes
-BOOTPROTO=none
-IPV6INIT=no
-IPV6_AUTOCONF=no
-DELAY=5
-STP=yes]]></programlisting>
- <para>With this configuration you should be able to restart the network, although a reboot is recommended to see if everything works properly.</para>
- <warning><para>Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning!</para></warning>
- </section>
- <section>
- <title>Configure in Ubuntu</title>
- <para>All the required packages were installed when you installed libvirt, so we only have to configure the network.</para>
- <programlisting language="Bash">vi /etc/network/interfaces</programlisting>
- <para>Modify the interfaces file to look like this:</para>
- <programlisting><![CDATA[auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto eth0.100
-iface eth0.100 inet static
- address 192.168.42.11
- netmask 255.255.255.240
- gateway 192.168.42.1
- dns-nameservers 8.8.8.8 8.8.4.4
- dns-domain lab.example.org
-
-# Public network
-auto cloudbr0
-iface cloudbr0 inet manual
- bridge_ports eth0.200
- bridge_fd 5
- bridge_stp off
- bridge_maxwait 1
-
-# Private network
-auto cloudbr1
-iface cloudbr1 inet manual
- bridge_ports eth0.300
- bridge_fd 5
- bridge_stp off
- bridge_maxwait 1]]></programlisting>
- <para>With this configuration you should be able to restart the network, although a reboot is recommended to see if everything works properly.</para>
- <warning><para>Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning!</para></warning>
- </section>
- </section>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-overview.xml b/docs/en-US/hypervisor-host-install-overview.xml
deleted file mode 100644
index 716b43d..0000000
--- a/docs/en-US/hypervisor-host-install-overview.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-overview">
- <title>KVM Installation Overview</title>
- <para>If you want to use the Linux Kernel Virtual Machine (KVM) hypervisor to run guest virtual machines, install KVM on the host(s) in your cloud. The material in this section doesn't duplicate KVM installation docs. It provides the &PRODUCT;-specific steps that are needed to prepare a KVM host to work with &PRODUCT;.</para>
- <warning><para>Before continuing, make sure that you have applied the latest updates to your host.</para></warning>
- <warning><para>It is NOT recommended to run services on this host not controlled by &PRODUCT;.</para></warning>
- <para>The procedure for installing a KVM Hypervisor Host is:</para>
- <orderedlist>
- <listitem><para>Prepare the Operating System</para></listitem>
- <listitem><para>Install and configure libvirt</para></listitem>
- <listitem><para>Configure Security Policies (AppArmor and SELinux)</para></listitem>
- <listitem><para>Install and configure the Agent</para></listitem>
- </orderedlist>
-</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-prepare-os.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-prepare-os.xml b/docs/en-US/hypervisor-host-install-prepare-os.xml
deleted file mode 100644
index 44852f2..0000000
--- a/docs/en-US/hypervisor-host-install-prepare-os.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-prepare-os">
- <title>Prepare the Operating System</title>
- <para>The OS of the Host must be prepared to host the &PRODUCT; Agent and run KVM instances.</para>
- <orderedlist>
- <listitem><para>Log in to your OS as root.</para></listitem>
- <listitem>
- <para>Check for a fully qualified hostname.</para>
- <programlisting language="Bash"><command>$ hostname --fqdn</command></programlisting>
- <para>This should return a fully qualified hostname such as "kvm1.lab.example.org". If it does not, edit /etc/hosts so that it does.</para>
- </listitem>
- <listitem>
- <para>Make sure that the machine can reach the Internet.</para>
- <programlisting language="Bash"><command>$ ping www.cloudstack.org</command></programlisting>
- </listitem>
- <listitem>
- <para>Turn on NTP for time synchronization.</para>
- <note><para>NTP is required to synchronize the clocks of the servers in your cloud. Unsynchronized clocks can cause unexpected problems.</para></note>
- <orderedlist numeration="loweralpha">
- <listitem><para>Install NTP</para>
- <para condition="community">On RHEL or CentOS:</para>
- <programlisting language="Bash"><command>$ yum install ntp</command></programlisting>
- <para condition="community">On Ubuntu:</para>
- <programlisting language="Bash"><command>$ apt-get install openntpd</command></programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Repeat all of these steps on every hypervisor host.</para></listitem>
- </orderedlist>
-</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-host-install-security-policies.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-security-policies.xml b/docs/en-US/hypervisor-host-install-security-policies.xml
deleted file mode 100644
index 03da04b..0000000
--- a/docs/en-US/hypervisor-host-install-security-policies.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-host-install-security-policies">
- <title>Configure the Security Policies</title>
- <para>&PRODUCT; does various things which can be blocked by security mechanisms like AppArmor and SELinux. These have to be disabled to ensure the Agent has all the required permissions.</para>
- <orderedlist>
- <listitem>
- <para>Configure SELinux (RHEL and CentOS)</para>
- <orderedlist numeration="loweralpha">
- <listitem>
- <para>Check to see whether SELinux is installed on your machine. If not, you can skip this section.</para>
- <para>In RHEL or CentOS, SELinux is installed and enabled by default. You can verify this with:</para>
- <programlisting language="Bash"><command>$ rpm -qa | grep selinux</command></programlisting>
- </listitem>
- <listitem>
- <para>Set the SELINUX variable in <filename>/etc/selinux/config</filename> to "permissive". This ensures that the permissive setting will be maintained after a system reboot.</para>
- <para>In RHEL or CentOS:</para>
- <programlisting language="Bash">vi /etc/selinux/config</programlisting>
- <para>Change the following line</para>
- <programlisting>SELINUX=enforcing</programlisting>
- <para>to this</para>
- <programlisting>SELINUX=permissive</programlisting>
- </listitem>
- <listitem>
- <para>Then set SELinux to permissive starting immediately, without requiring a system reboot.</para>
- <programlisting language="Bash"><command>$ setenforce permissive</command></programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>
- <para>Configure Apparmor (Ubuntu)</para>
- <orderedlist numeration="loweralpha">
- <listitem>
- <para>Check to see whether AppArmor is installed on your machine. If not, you can skip this section.</para>
- <para>In Ubuntu AppArmor is installed and enabled by default. You can verify this with:</para>
- <programlisting language="Bash"><command>$ dpkg --list 'apparmor'</command></programlisting>
- </listitem>
- <listitem>
- <para>Disable the AppArmor profiles for libvirt</para>
- <programlisting language="Bash"><command>$ ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/</command></programlisting>
- <programlisting language="Bash"><command>$ ln -s /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper /etc/apparmor.d/disable/</command></programlisting>
- <programlisting language="Bash"><command>$ apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd</command></programlisting>
- <programlisting language="Bash"><command>$ apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper</command></programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
-</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-installation.xml b/docs/en-US/hypervisor-installation.xml
deleted file mode 100644
index 5ee7dea..0000000
--- a/docs/en-US/hypervisor-installation.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<chapter id="hypervisor-installation">
- <title>Hypervisor Installation</title>
- <xi:include href="hypervisor-kvm-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="citrix-xenserver-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="vmware-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <!-- <xi:include href="ovm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
- <xi:include href="lxc-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-kvm-install-flow.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-kvm-install-flow.xml b/docs/en-US/hypervisor-kvm-install-flow.xml
deleted file mode 100644
index aa19e47..0000000
--- a/docs/en-US/hypervisor-kvm-install-flow.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-kvm-install-flow">
- <title>KVM Hypervisor Host Installation</title>
- <xi:include href="hypervisor-kvm-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-prepare-os.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-agent.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-libvirt.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-security-policies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-network-openvswitch.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-firewall.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-host-install-finish.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="hypervisor-support-for-primarystorage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-kvm-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-kvm-requirements.xml b/docs/en-US/hypervisor-kvm-requirements.xml
deleted file mode 100644
index cdfc808..0000000
--- a/docs/en-US/hypervisor-kvm-requirements.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="hypervisor-kvm-requirements">
- <title>System Requirements for KVM Hypervisor Hosts</title>
- <para>KVM is included with a variety of Linux-based operating systems. Although you are not required to run these distributions, the following are recommended:</para>
- <itemizedlist>
- <listitem><para>CentOS / RHEL: 6.3</para></listitem>
- <listitem><para>Ubuntu: 12.04(.1)</para></listitem>
- </itemizedlist>
- <para>The main requirement for KVM hypervisors is the libvirt and Qemu version. No matter what
- Linux distribution you are using, make sure the following requirements are met:</para>
- <itemizedlist>
- <listitem><para>libvirt: 0.9.4 or higher</para></listitem>
- <listitem><para>Qemu/KVM: 1.0 or higher</para></listitem>
- </itemizedlist>
- <para>The default bridge in &PRODUCT; is the Linux native bridge implementation (bridge module). &PRODUCT; includes an option to work with OpenVswitch, the requirements are listed below</para>
- <itemizedlist>
- <listitem><para>libvirt: 0.9.11 or higher</para></listitem>
- <listitem><para>openvswitch: 1.7.1 or higher</para></listitem>
- </itemizedlist>
- <para>In addition, the following hardware requirements apply:</para>
- <itemizedlist>
- <listitem><para>Within a single cluster, the hosts must be of the same distribution version.</para></listitem>
- <listitem><para>All hosts within a cluster must be homogenous. The CPUs must be of the same type, count, and feature flags.</para></listitem>
- <listitem><para>Must support HVM (Intel-VT or AMD-V enabled)</para></listitem>
- <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
- <listitem><para>4 GB of memory</para></listitem>
- <listitem><para>At least 1 NIC</para></listitem>
- <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
- </itemizedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/hypervisor-support-for-primarystorage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml
deleted file mode 100644
index fdef1f2..0000000
--- a/docs/en-US/hypervisor-support-for-primarystorage.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<section id="hypervisor-support-for-primarystorage">
- <title>Hypervisor Support for Primary Storage</title>
- <para>The following table shows storage options and parameters for different hypervisors.</para>
- <informaltable>
- <tgroup cols="5">
- <colspec colname="c1" colnum="1" colwidth="34%"/>
- <colspec colname="c2" colnum="2" colwidth="16%"/>
- <colspec colname="c3" colnum="3" colwidth="16%"/>
- <colspec colname="c4" colnum="4" colwidth="17%"/>
- <colspec colname="c5" colnum="5" colwidth="17%"/>
- <thead>
- <row>
- <entry/>
- <entry><para>VMware vSphere</para></entry>
- <entry><para>Citrix XenServer</para></entry>
- <entry><para>KVM</para></entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and
- Snapshots</emphasis></emphasis></para></entry>
- <entry><para>VMDK</para></entry>
- <entry><para>VHD</para></entry>
- <entry><para>QCOW2</para></entry>
- </row>
- <row>
- <entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry>
- <entry><para>VMFS</para></entry>
- <entry><para>Clustered LVM</para></entry>
- <entry><para>Yes, via Shared Mountpoint</para></entry>
- </row>
- <row>
- <entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry>
- <entry><para>VMFS</para></entry>
- <entry><para>Yes, via Existing SR</para></entry>
- <entry><para>Yes, via Shared Mountpoint</para></entry>
- </row>
- <row>
- <entry><para><emphasis role="bold">NFS support</emphasis></para></entry>
- <entry><para>Y</para></entry>
- <entry><para>Y</para></entry>
- <entry><para>Y</para></entry>
- </row>
- <row>
- <entry><para><emphasis role="bold">Local storage support</emphasis></para></entry>
- <entry><para>Y</para></entry>
- <entry><para>Y</para></entry>
- <entry><para>Y</para></entry>
- </row>
- <row>
- <entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry>
- <entry><para>NFS and iSCSI</para></entry>
- <entry><para>NFS</para></entry>
- <entry><para>NFS</para></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes
- and does not support over-provisioning in the hypervisor. The storage server itself, however,
- can support thin-provisioning. As a result the &PRODUCT; can still support storage
- over-provisioning by running on thin-provisioned storage volumes.</para>
- <para>KVM supports "Shared Mountpoint" storage. A shared mountpoint is a file system path local to
- each server in a given cluster. The path must be the same across all Hosts in the cluster, for
- example /mnt/primary1. This shared mountpoint is assumed to be a clustered filesystem such as
- OCFS2. In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done
- with NFS. The &PRODUCT; requires that the administrator insure that the storage is
- available</para>
- <!-- <para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para> -->
- <para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global
- configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning.
- This is independent of hypervisor type.</para>
- <para>Local storage is an option for primary storage for vSphere, XenServer, and KVM. When the
- local disk option is enabled, a local disk storage pool is automatically created on each host.
- To use local storage for the System Virtual Machines (such as the Virtual Router), set
- system.vm.use.local.storage to true in global configuration.</para>
- <para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could
- provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and
- then add a second iSCSI LUN when the first approaches capacity.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/1000-foot-view.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/1000-foot-view.png b/docs/en-US/images/1000-foot-view.png
deleted file mode 100644
index 2fe3c16..0000000
Binary files a/docs/en-US/images/1000-foot-view.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/DevCloud-hostonly.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/DevCloud-hostonly.png b/docs/en-US/images/DevCloud-hostonly.png
deleted file mode 100644
index 111f93a..0000000
Binary files a/docs/en-US/images/DevCloud-hostonly.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/DevCloud.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/DevCloud.png b/docs/en-US/images/DevCloud.png
deleted file mode 100644
index 5e83ca9..0000000
Binary files a/docs/en-US/images/DevCloud.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/VMSnapshotButton.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/VMSnapshotButton.png b/docs/en-US/images/VMSnapshotButton.png
deleted file mode 100644
index 5217740..0000000
Binary files a/docs/en-US/images/VMSnapshotButton.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/Workloads.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/Workloads.png b/docs/en-US/images/Workloads.png
deleted file mode 100644
index 9282f57..0000000
Binary files a/docs/en-US/images/Workloads.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-account-screen.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-account-screen.png b/docs/en-US/images/add-account-screen.png
deleted file mode 100644
index aaa798f..0000000
Binary files a/docs/en-US/images/add-account-screen.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-cluster.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-cluster.png b/docs/en-US/images/add-cluster.png
deleted file mode 100644
index 26ae3fd..0000000
Binary files a/docs/en-US/images/add-cluster.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-gateway.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-gateway.png b/docs/en-US/images/add-gateway.png
deleted file mode 100644
index da8eed9..0000000
Binary files a/docs/en-US/images/add-gateway.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-gslb.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-gslb.png b/docs/en-US/images/add-gslb.png
deleted file mode 100644
index 827a913..0000000
Binary files a/docs/en-US/images/add-gslb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-guest-network.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-guest-network.png b/docs/en-US/images/add-guest-network.png
deleted file mode 100644
index b22181e..0000000
Binary files a/docs/en-US/images/add-guest-network.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-ip-range.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-ip-range.png b/docs/en-US/images/add-ip-range.png
deleted file mode 100644
index 9f4d9d4..0000000
Binary files a/docs/en-US/images/add-ip-range.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-ldap-configuration-ad.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-ldap-configuration-ad.png b/docs/en-US/images/add-ldap-configuration-ad.png
deleted file mode 100644
index d4d3e78..0000000
Binary files a/docs/en-US/images/add-ldap-configuration-ad.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-ldap-configuration-failure.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-ldap-configuration-failure.png b/docs/en-US/images/add-ldap-configuration-failure.png
deleted file mode 100644
index 312a1d6..0000000
Binary files a/docs/en-US/images/add-ldap-configuration-failure.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-ldap-configuration-openldap.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-ldap-configuration-openldap.png b/docs/en-US/images/add-ldap-configuration-openldap.png
deleted file mode 100644
index 70ce579..0000000
Binary files a/docs/en-US/images/add-ldap-configuration-openldap.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-ldap-configuration.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-ldap-configuration.png b/docs/en-US/images/add-ldap-configuration.png
deleted file mode 100644
index e43cbaf..0000000
Binary files a/docs/en-US/images/add-ldap-configuration.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-new-gateway-vpc.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-new-gateway-vpc.png b/docs/en-US/images/add-new-gateway-vpc.png
deleted file mode 100644
index 5145622..0000000
Binary files a/docs/en-US/images/add-new-gateway-vpc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-tier.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-tier.png b/docs/en-US/images/add-tier.png
deleted file mode 100644
index 0994dbd..0000000
Binary files a/docs/en-US/images/add-tier.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-vlan-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-vlan-icon.png b/docs/en-US/images/add-vlan-icon.png
deleted file mode 100644
index 04655dc..0000000
Binary files a/docs/en-US/images/add-vlan-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-vm-vpc.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-vm-vpc.png b/docs/en-US/images/add-vm-vpc.png
deleted file mode 100644
index b2821a6..0000000
Binary files a/docs/en-US/images/add-vm-vpc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-vpc.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-vpc.png b/docs/en-US/images/add-vpc.png
deleted file mode 100644
index f334862..0000000
Binary files a/docs/en-US/images/add-vpc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/add-vpn-customer-gateway.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-vpn-customer-gateway.png b/docs/en-US/images/add-vpn-customer-gateway.png
deleted file mode 100644
index fdc3177..0000000
Binary files a/docs/en-US/images/add-vpn-customer-gateway.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/addAccount-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/addAccount-icon.png b/docs/en-US/images/addAccount-icon.png
deleted file mode 100644
index 4743dbe..0000000
Binary files a/docs/en-US/images/addAccount-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/addvm-tier-sharednw.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/addvm-tier-sharednw.png b/docs/en-US/images/addvm-tier-sharednw.png
deleted file mode 100644
index e60205f..0000000
Binary files a/docs/en-US/images/addvm-tier-sharednw.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/async-calls.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/async-calls.png b/docs/en-US/images/async-calls.png
deleted file mode 100644
index e24eee7..0000000
Binary files a/docs/en-US/images/async-calls.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/attach-disk-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/attach-disk-icon.png b/docs/en-US/images/attach-disk-icon.png
deleted file mode 100644
index 5e81d04..0000000
Binary files a/docs/en-US/images/attach-disk-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/autoscale-config.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/autoscale-config.png b/docs/en-US/images/autoscale-config.png
deleted file mode 100644
index 735ae96..0000000
Binary files a/docs/en-US/images/autoscale-config.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/basic-deployment.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/basic-deployment.png b/docs/en-US/images/basic-deployment.png
deleted file mode 100644
index 894a053..0000000
Binary files a/docs/en-US/images/basic-deployment.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/change-admin-password.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/change-admin-password.png b/docs/en-US/images/change-admin-password.png
deleted file mode 100644
index 938e861..0000000
Binary files a/docs/en-US/images/change-admin-password.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/change-affinity-button.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/change-affinity-button.png b/docs/en-US/images/change-affinity-button.png
deleted file mode 100644
index c21ef75..0000000
Binary files a/docs/en-US/images/change-affinity-button.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/change-password.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/change-password.png b/docs/en-US/images/change-password.png
deleted file mode 100644
index fbb203a..0000000
Binary files a/docs/en-US/images/change-password.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/change-service-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/change-service-icon.png b/docs/en-US/images/change-service-icon.png
deleted file mode 100644
index 780e235..0000000
Binary files a/docs/en-US/images/change-service-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/cluster-overview.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/cluster-overview.png b/docs/en-US/images/cluster-overview.png
deleted file mode 100644
index 18a86c3..0000000
Binary files a/docs/en-US/images/cluster-overview.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/clusterDefinition.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/clusterDefinition.png b/docs/en-US/images/clusterDefinition.png
deleted file mode 100644
index 6170f9f..0000000
Binary files a/docs/en-US/images/clusterDefinition.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/compute-service-offerings.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/compute-service-offerings.png b/docs/en-US/images/compute-service-offerings.png
deleted file mode 100644
index 88eb6f8..0000000
Binary files a/docs/en-US/images/compute-service-offerings.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/configuration-edit-success.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/configuration-edit-success.png b/docs/en-US/images/configuration-edit-success.png
deleted file mode 100644
index 2e21dc1..0000000
Binary files a/docs/en-US/images/configuration-edit-success.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/configurations-screen.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/configurations-screen.png b/docs/en-US/images/configurations-screen.png
deleted file mode 100644
index 5458608..0000000
Binary files a/docs/en-US/images/configurations-screen.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/console-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/console-icon.png b/docs/en-US/images/console-icon.png
deleted file mode 100644
index bf28886..0000000
Binary files a/docs/en-US/images/console-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/create-account-post.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/create-account-post.png b/docs/en-US/images/create-account-post.png
deleted file mode 100644
index ea5ce3f..0000000
Binary files a/docs/en-US/images/create-account-post.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/create-account-request.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/create-account-request.png b/docs/en-US/images/create-account-request.png
deleted file mode 100644
index b36d1ff..0000000
Binary files a/docs/en-US/images/create-account-request.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/create-vpn-connection.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/create-vpn-connection.png b/docs/en-US/images/create-vpn-connection.png
deleted file mode 100644
index cd5515f..0000000
Binary files a/docs/en-US/images/create-vpn-connection.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/dedicate-resource-button.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/dedicate-resource-button.png b/docs/en-US/images/dedicate-resource-button.png
deleted file mode 100644
index 0ac38e0..0000000
Binary files a/docs/en-US/images/dedicate-resource-button.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/del-tier.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/del-tier.png b/docs/en-US/images/del-tier.png
deleted file mode 100644
index aa9846c..0000000
Binary files a/docs/en-US/images/del-tier.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/delete-button.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/delete-button.png b/docs/en-US/images/delete-button.png
deleted file mode 100644
index 27145ce..0000000
Binary files a/docs/en-US/images/delete-button.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/delete-ldap-configuration-failure.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/delete-ldap-configuration-failure.png b/docs/en-US/images/delete-ldap-configuration-failure.png
deleted file mode 100644
index 2b7bfe5..0000000
Binary files a/docs/en-US/images/delete-ldap-configuration-failure.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/delete-ldap-configuration.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/delete-ldap-configuration.png b/docs/en-US/images/delete-ldap-configuration.png
deleted file mode 100644
index c2f6c46..0000000
Binary files a/docs/en-US/images/delete-ldap-configuration.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/delete-ldap.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/delete-ldap.png b/docs/en-US/images/delete-ldap.png
deleted file mode 100644
index c97bb4c..0000000
Binary files a/docs/en-US/images/delete-ldap.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/destroy-instance.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/destroy-instance.png b/docs/en-US/images/destroy-instance.png
deleted file mode 100644
index aa9846c..0000000
Binary files a/docs/en-US/images/destroy-instance.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/detach-disk-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/detach-disk-icon.png b/docs/en-US/images/detach-disk-icon.png
deleted file mode 100644
index 536a4f8..0000000
Binary files a/docs/en-US/images/detach-disk-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/dvswitch-config.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/dvswitch-config.png b/docs/en-US/images/dvswitch-config.png
deleted file mode 100644
index edce6e8..0000000
Binary files a/docs/en-US/images/dvswitch-config.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/dvswitchconfig.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/dvswitchconfig.png b/docs/en-US/images/dvswitchconfig.png
deleted file mode 100644
index 55b1ef7..0000000
Binary files a/docs/en-US/images/dvswitchconfig.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/ec2-s3-configuration.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/ec2-s3-configuration.png b/docs/en-US/images/ec2-s3-configuration.png
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/edit-configuration.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/edit-configuration.png b/docs/en-US/images/edit-configuration.png
deleted file mode 100644
index 43874bf..0000000
Binary files a/docs/en-US/images/edit-configuration.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/edit-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/edit-icon.png b/docs/en-US/images/edit-icon.png
deleted file mode 100644
index 42417e2..0000000
Binary files a/docs/en-US/images/edit-icon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/edit-traffic-type.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/edit-traffic-type.png b/docs/en-US/images/edit-traffic-type.png
deleted file mode 100644
index 16cda94..0000000
Binary files a/docs/en-US/images/edit-traffic-type.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/egress-firewall-rule.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/egress-firewall-rule.png b/docs/en-US/images/egress-firewall-rule.png
deleted file mode 100644
index fa1d8ec..0000000
Binary files a/docs/en-US/images/egress-firewall-rule.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/eip-ns-basiczone.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/eip-ns-basiczone.png b/docs/en-US/images/eip-ns-basiczone.png
deleted file mode 100644
index bc88570..0000000
Binary files a/docs/en-US/images/eip-ns-basiczone.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/enable-disable-autoscale.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/enable-disable-autoscale.png b/docs/en-US/images/enable-disable-autoscale.png
deleted file mode 100644
index ee02ef2..0000000
Binary files a/docs/en-US/images/enable-disable-autoscale.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/enable-disable.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/enable-disable.png b/docs/en-US/images/enable-disable.png
deleted file mode 100644
index cab31ae..0000000
Binary files a/docs/en-US/images/enable-disable.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/gslb.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/gslb.png b/docs/en-US/images/gslb.png
deleted file mode 100644
index f0a04db..0000000
Binary files a/docs/en-US/images/gslb.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/guest-traffic-setup.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/guest-traffic-setup.png b/docs/en-US/images/guest-traffic-setup.png
deleted file mode 100644
index 5250819..0000000
Binary files a/docs/en-US/images/guest-traffic-setup.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/images/http-access.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/http-access.png b/docs/en-US/images/http-access.png
deleted file mode 100644
index 817f197..0000000
Binary files a/docs/en-US/images/http-access.png and /dev/null differ