You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/14 19:17:40 UTC
[48/81] [abbrv] [partial] Removing docs from master
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/Revision_History.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Revision_History.xml b/docs/en-US/Revision_History.xml
deleted file mode 100644
index 55d741a..0000000
--- a/docs/en-US/Revision_History.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix 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.
--->
-
-<appendix id="appe-cloudstack-Revision_History">
- <title>Revision History</title>
- <simpara>
- <revhistory>
- <revision>
- <revnumber>0-0</revnumber>
- <date>Tue May 29 2012</date>
- <author>
- <firstname>Jessica</firstname>
- <surname>Tomechak</surname>
- <email/>
- </author>
- <revdescription>
- <simplelist>
- <member>Initial creation of book by publican</member>
- </simplelist>
- </revdescription>
- </revision>
- </revhistory>
- </simpara>
-</appendix>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/Revision_History_Install_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Revision_History_Install_Guide.xml b/docs/en-US/Revision_History_Install_Guide.xml
deleted file mode 100644
index ee8dd31..0000000
--- a/docs/en-US/Revision_History_Install_Guide.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix 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.
--->
-
-<appendix id="appe-cloudstack-Revision_History">
- <title>Revision History</title>
- <simpara>
- <revhistory>
- <revision>
- <revnumber>1-0</revnumber>
- <date>October 5 2012</date>
- <author>
- <firstname>Jessica</firstname>
- <surname>Tomechak</surname>
- <email/>
- </author>
- <author>
- <firstname>Radhika</firstname>
- <surname>PC</surname>
- <email/>
- </author>
- <author>
- <firstname>Wido</firstname>
- <surname>den Hollander</surname>
- <email/>
- </author>
- <revdescription>
- <simplelist>
- <member>Initial publication</member>
- </simplelist>
- </revdescription>
- </revision>
- </revhistory>
- </simpara>
-</appendix>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/SSL-keystore-path-and-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/SSL-keystore-path-and-password.xml b/docs/en-US/SSL-keystore-path-and-password.xml
deleted file mode 100644
index f7b7426..0000000
--- a/docs/en-US/SSL-keystore-path-and-password.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="SSL-keystore-path-and-password">
- <title>SSL Keystore Path and Password</title>
- <para>If the LDAP server requires SSL, you need to enable it in the ldapConfig command by setting the parameters ssl, truststore, and truststorepass. Before enabling SSL for ldapConfig, you need to get the certificate which the LDAP server is using and add it to a trusted keystore. You will need to know the path to the keystore and the password.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/VPN-user-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/VPN-user-usage-record-format.xml b/docs/en-US/VPN-user-usage-record-format.xml
deleted file mode 100644
index dd66fb4..0000000
--- a/docs/en-US/VPN-user-usage-record-format.xml
+++ /dev/null
@@ -1,40 +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="VPN-user-usage-record-format">
- <title>VPN User Usage Record Format</title>
- <itemizedlist>
- <listitem><para>account – name of the account</para></listitem>
- <listitem><para>accountid – ID of the account</para></listitem>
- <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
- <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
- <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
- <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
- <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
- <listitem><para>usageid – VPN user ID</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
- <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
- </itemizedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-clusters.xml b/docs/en-US/about-clusters.xml
deleted file mode 100644
index aa8604c..0000000
--- a/docs/en-US/about-clusters.xml
+++ /dev/null
@@ -1,63 +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="about-clusters">
- <title>About Clusters</title>
- <para>
- A cluster provides a way to group hosts. To be precise, a cluster is a
- XenServer server pool, a set of KVM servers, <!-- a set of OVM hosts -->, or a
- VMware cluster preconfigured in vCenter. The hosts in a cluster all
- have identical hardware, run the same hypervisor, are on the same subnet,
- and access the same shared primary storage. Virtual machine instances
- (VMs) can be live-migrated from one host to another within the same
- cluster, without interrupting service to the user.
- </para>
- <para>
- A cluster is the third-largest organizational unit within a &PRODUCT;
- deployment. Clusters are contained within pods, and pods are contained
- within zones. Size of the cluster is limited by the underlying hypervisor,
- although the &PRODUCT; recommends less in most cases; see Best Practices.
- </para>
- <para>
- A cluster consists of one or more hosts and one or more primary storage
- servers.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/cluster-overview.png" />
- </imageobject>
- <textobject><phrase>cluster-overview.png: Structure of a simple cluster</phrase></textobject>
- </mediaobject>
- <para>&PRODUCT; allows multiple clusters in a cloud deployment.</para>
- <para>
- Even when local storage is used exclusively, clusters are still required
- organizationally, even if there is just one host per cluster.
- </para>
- <para>
- When VMware is used, every VMware cluster is managed by a vCenter server.
- Administrator must register the vCenter server with &PRODUCT;. There may
- be multiple vCenter servers per zone. Each vCenter server may manage
- multiple VMware clusters.
- </para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-hosts.xml b/docs/en-US/about-hosts.xml
deleted file mode 100644
index 87b6bab..0000000
--- a/docs/en-US/about-hosts.xml
+++ /dev/null
@@ -1,46 +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="about-hosts">
- <title>About Hosts</title>
- <para>A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs. For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts.</para>
- <para>The host is the smallest organizational unit within a &PRODUCT; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.</para>
- <para>Hosts in a &PRODUCT; deployment:</para>
- <itemizedlist>
- <listitem><para>Provide the CPU, memory, storage, and networking resources needed to host the virtual
- machines</para></listitem>
- <listitem><para>Interconnect using a high bandwidth TCP/IP network and connect to the Internet</para></listitem>
- <listitem><para>May reside in multiple data centers across different geographic locations</para></listitem>
- <listitem><para>May have different capacities (different CPU speeds, different amounts of RAM, etc.), although the hosts within a cluster must all be homogeneous</para></listitem>
- </itemizedlist>
- <para>Additional hosts can be added at any time to provide more capacity for guest VMs.</para>
- <para>&PRODUCT; automatically detects the amount of CPU and memory resources provided by the Hosts.</para>
- <para>Hosts are not visible to the end user. An end user cannot determine which host their guest has been assigned to.</para>
- <para>For a host to function in &PRODUCT;, you must do the following:</para>
- <itemizedlist>
- <listitem><para>Install hypervisor software on the host</para></listitem>
- <listitem><para>Assign an IP address to the host</para></listitem>
- <listitem><para>Ensure the host is connected to the &PRODUCT; Management Server</para></listitem>
- </itemizedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-password-encryption.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-password-encryption.xml b/docs/en-US/about-password-encryption.xml
deleted file mode 100644
index a13ff60..0000000
--- a/docs/en-US/about-password-encryption.xml
+++ /dev/null
@@ -1,65 +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="about-password-encryption">
- <title>About Password and Key Encryption</title>
- <para>&PRODUCT; stores several sensitive passwords and secret keys that are used to provide
- security. These values are always automatically encrypted:</para>
- <itemizedlist>
- <listitem>
- <para>Database secret key</para>
- </listitem>
- <listitem>
- <para>Database password</para>
- </listitem>
- <listitem>
- <para>SSH keys</para>
- </listitem>
- <listitem>
- <para>Compute node root password</para>
- </listitem>
- <listitem>
- <para> VPN password</para>
- </listitem>
- <listitem>
- <para>User API secret key</para>
- </listitem>
- <listitem>
- <para>VNC password</para>
- </listitem>
- </itemizedlist>
- <para>&PRODUCT; uses the Java Simplified Encryption (JASYPT) library. The data values are
- encrypted and decrypted using a database secret key, which is stored in one of &PRODUCT;’s
- internal properties files along with the database password. The other encrypted values listed
- above, such as SSH keys, are in the &PRODUCT; internal database.</para>
- <para>Of course, the database secret key itself can not be stored in the open – it must be
- encrypted. How then does &PRODUCT; read it? A second secret key must be provided from an
- external source during Management Server startup. This key can be provided in one of two ways:
- loaded from a file or provided by the &PRODUCT; administrator. The &PRODUCT; database has a
- configuration setting that lets it know which of these methods will be used. If the encryption
- type is set to "file," the key must be in a file in a known location. If the encryption type is
- set to "web," the administrator runs the utility
- com.cloud.utils.crypt.EncryptionSecretKeySender, which relays the key to the Management Server
- over a known port.</para>
- <para>The encryption type, database secret key, and Management Server secret key are set during
- &PRODUCT; installation. They are all parameters to the &PRODUCT; database setup script
- (cloudstack-setup-databases). The default values are file, password, and password. It is, of course,
- highly recommended that you change these to more secure keys.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-physical-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-physical-networks.xml b/docs/en-US/about-physical-networks.xml
deleted file mode 100644
index b22e48b..0000000
--- a/docs/en-US/about-physical-networks.xml
+++ /dev/null
@@ -1,42 +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="about-physical-networks">
- <title>About Physical Networks</title>
- <para>Part of adding a zone is setting up the physical network. One or (in an advanced zone) more physical networks can be associated with each zone. The network corresponds to a NIC on the hypervisor host. Each physical network can carry one or more types of network traffic. The choices of traffic type for each network vary depending on whether you are creating a zone with basic networking or advanced networking.</para>
- <para>A physical network is the actual network hardware and wiring in a zone. A zone can have multiple physical networks. An administrator can:</para>
- <itemizedlist>
- <listitem><para>Add/Remove/Update physical networks in a zone</para></listitem>
- <listitem><para>Configure VLANs on the physical network</para></listitem>
- <listitem><para>Configure a name so the network can be recognized by hypervisors</para></listitem>
- <listitem><para>Configure the service providers (firewalls, load balancers, etc.) available on a physical network</para></listitem>
- <listitem><para>Configure the IP addresses trunked to a physical network</para></listitem>
- <listitem><para>Specify what type of traffic is carried on the physical network, as well as other properties like network speed</para></listitem>
- </itemizedlist>
- <xi:include href="basic-zone-network-traffic-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="basic-zone-guest-ip-addresses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="advanced-zone-network-traffic-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="advanced-zone-guest-ip-addresses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="advanced-zone-public-ip-addresses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="system-reserved-ip-addresses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-pods.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-pods.xml b/docs/en-US/about-pods.xml
deleted file mode 100644
index 57ae1a3..0000000
--- a/docs/en-US/about-pods.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="about-pods">
- <title>About Pods</title>
- <para>A pod often represents a single rack. Hosts in the same pod are in the same subnet.
- A pod is the second-largest organizational unit within a &PRODUCT; deployment. Pods are contained within zones. Each zone can contain one or more pods.
- A pod consists of one or more clusters of hosts and one or more primary storage servers.
- Pods are not visible to the end user.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/pod-overview.png" />
- </imageobject>
- <textobject><phrase>pod-overview.png: Nested structure of a simple pod</phrase></textobject>
- </mediaobject>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-primary-storage.xml b/docs/en-US/about-primary-storage.xml
deleted file mode 100644
index 9af9f2d..0000000
--- a/docs/en-US/about-primary-storage.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="about-primary-storage">
- <title>About Primary Storage</title>
- <para>Primary storage is associated with a cluster and/or a zone. It stores the disk volumes for all of the VMs running on hosts in that cluster. You can add multiple primary storage servers to a cluster or a zone (at least one is required at the cluster level). Primary storage is typically located close to the hosts for increased performance. &PRODUCT; manages the allocation of guest virtual disks to particular primary storage devices.</para>
- <para>Primary storage uses the concept of a storage tag. A storage tag is a label that is used to identify the primary storage. Each primary storage can be associated with zero, one, or more storage tags. When a VM is spun up or a data disk attached to a VM for the first time, these tags, if supplied, are used to determine which primary storage can support the VM or data disk (ex. say you need to guarantee a certain number of IOPS to a particular volume).</para>
- <para>Primary storage can be either static or dynamic. Static primary storage is what CloudStack has traditionally supported. In this model, the administrator must present CloudStack with a certain amount of preallocated storage (ex. a volume from a SAN) and CloudStack can place many of its volumes on this storage. In the newer, dynamic model, the administrator can present CloudStack with a storage system itself (ex. a SAN). CloudStack, working in concert with a plug-in developed for that storage system, can dynamically create volumes on the storage system. A valuable use for this ability is Quality of Service (QoS). If a volume created in CloudStack can be backed by a dedicated volume on a SAN (i.e. a one-to-one mapping between a SAN volume and a CloudStack volume) and the SAN provides QoS, then CloudStack can provide QoS.</para>
- <para>&PRODUCT; is designed to work with all standards-compliant iSCSI and NFS servers that are supported by the underlying hypervisor, including, for example:</para>
- <itemizedlist>
- <listitem><para>SolidFire for iSCSI</para></listitem>
- <listitem><para>Dell EqualLogic™ for iSCSI</para></listitem>
- <listitem><para>Network Appliances filers for NFS and iSCSI</para></listitem>
- <listitem><para>Scale Computing for NFS</para></listitem>
- </itemizedlist>
- <para>If you intend to use only local disk for your installation, you can skip to Add Secondary Storage.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-regions.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-regions.xml b/docs/en-US/about-regions.xml
deleted file mode 100644
index a12c183..0000000
--- a/docs/en-US/about-regions.xml
+++ /dev/null
@@ -1,50 +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="about-regions">
- <title>About Regions</title>
- <para>To increase reliability of the cloud, you can optionally group resources into multiple geographic regions.
- A region is the largest available organizational unit within a &PRODUCT; deployment.
- A region is made up of several availability zones, where each zone is roughly equivalent to a datacenter.
- Each region is controlled by its own cluster of Management Servers, running in one of the zones.
- The zones in a region are typically located in close geographical proximity.
- Regions are a useful technique for providing fault tolerance and disaster recovery.</para>
- <para>By grouping zones into regions, the cloud can achieve higher availability and scalability.
- User accounts can span regions, so that users can deploy VMs in multiple, widely-dispersed regions.
- Even if one of the regions becomes unavailable, the services are still available to the end-user through VMs deployed in another region.
- And by grouping communities of zones under their own nearby Management Servers, the latency of communications within the cloud is reduced
- compared to managing widely-dispersed zones from a single central Management Server.
- </para>
- <para>
- Usage records can also be consolidated and tracked at the region level, creating reports or invoices for each geographic region.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/region-overview.png" />
- </imageobject>
- <textobject><phrase>region-overview.png: Nested structure of a region.</phrase></textobject>
- </mediaobject>
- <para>Regions are visible to the end user. When a user starts a guest VM on a particular &PRODUCT; Management Server,
- the user is implicitly selecting that region for their guest.
- Users might also be required to copy their private templates to additional regions to enable creation of guest VMs using their templates in those regions.</para>
- </section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-secondary-storage.xml b/docs/en-US/about-secondary-storage.xml
deleted file mode 100644
index 516ec0e..0000000
--- a/docs/en-US/about-secondary-storage.xml
+++ /dev/null
@@ -1,51 +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="about-secondary-storage">
- <title>About Secondary Storage</title>
- <para>Secondary storage stores the following:</para>
- <itemizedlist>
- <listitem><para>Templates — OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</para></listitem>
- <listitem><para>ISO images — disc images containing data or bootable media for operating systems</para></listitem>
- <listitem><para>Disk volume snapshots — saved copies of VM data which can be used for data recovery or to create new templates</para></listitem>
- </itemizedlist>
- <para>The items in secondary storage are available to all hosts in the scope of
- the secondary storage, which may be defined as per zone or per region.</para>
- <para>To make items in secondary storage available to all hosts throughout the cloud, you can
- add object storage in addition to the
- zone-based NFS Secondary Staging Store.
- It is not necessary to
- copy templates and snapshots from one zone to another, as would be required when using zone
- NFS alone. Everything is available everywhere.</para>
- <para>&PRODUCT; provides plugins that enable both
- OpenStack Object Storage (Swift,
- <ulink url="http://swift.openstack.org">swift.openstack.org</ulink>)
- and Amazon Simple Storage Service (S3) object storage.
- When using one of these storage plugins, you configure Swift or S3 storage for
- the entire &PRODUCT;, then set up the NFS Secondary Staging Store for each zone. The NFS
- storage in each zone acts as a staging area through which all templates and other secondary
- storage data pass before being forwarded to Swoft or S3.
- The backing object storage acts as a cloud-wide
- resource, making templates and other data available to any zone in the cloud.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-security-groups.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-security-groups.xml b/docs/en-US/about-security-groups.xml
deleted file mode 100644
index 6a31b25..0000000
--- a/docs/en-US/about-security-groups.xml
+++ /dev/null
@@ -1,40 +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="about-security-groups">
- <title>About Security Groups</title>
- <para>Security groups provide a way to isolate traffic to VMs. A security group is a group of
- VMs that filter their incoming and outgoing traffic according to a set of rules, called
- ingress and egress rules. These rules filter network traffic according to the IP address
- that is attempting to communicate with the VM. Security groups are particularly useful in
- zones that use basic networking, because there is a single guest network for all guest VMs.
- In advanced zones, security groups are supported only on the KVM hypervisor.</para>
- <note><para>In a zone that uses advanced networking, you can instead define multiple guest networks to isolate traffic to VMs.</para>
- </note>
- <para></para>
- <para>Each &PRODUCT; account comes with a default security group that denies all inbound traffic and allows all outbound traffic. The default security group can be modified so that all new VMs inherit some other desired set of rules.</para>
- <para>Any &PRODUCT; user can set up any number of additional security groups. When a new VM is launched, it is assigned to the default security group unless another user-defined security group is specified. A VM can be a member of any number of security groups. Once a VM is assigned to a security group, it remains in that group for its entire lifetime; you can not move a running VM from one security group to another.</para>
- <para>You can modify a security group by deleting or adding any number of ingress and egress rules. When you do, the new rules apply to all VMs in the group, whether running or stopped.</para>
- <para>If no ingress rules are specified, then no traffic will be allowed in, except for responses to any traffic that has been allowed out through an egress rule.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-virtual-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-virtual-networks.xml b/docs/en-US/about-virtual-networks.xml
deleted file mode 100644
index 4dbd201..0000000
--- a/docs/en-US/about-virtual-networks.xml
+++ /dev/null
@@ -1,30 +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="about-virtual-networks">
- <title>About Virtual Networks</title>
- <para>A virtual network is a logical construct that enables multi-tenancy on a single physical network. In &PRODUCT; a virtual network can be shared or isolated.</para>
- <xi:include href="isolated-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="shared-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="runtime-allocation-virtual-network-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-working-with-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-working-with-vms.xml b/docs/en-US/about-working-with-vms.xml
deleted file mode 100644
index 90e5abf..0000000
--- a/docs/en-US/about-working-with-vms.xml
+++ /dev/null
@@ -1,64 +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="about-working-with-vms">
- <title>About Working with Virtual Machines</title>
- <para>&PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs
- executing in the cloud. &PRODUCT; provides several guest management operations for end users and
- administrators. VMs may be stopped, started, rebooted, and destroyed.</para>
- <para>Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are
- available for end users to organize their VMs. Each VM can have three names for use in different
- contexts. Only two of these names can be controlled by the user:</para>
- <itemizedlist>
- <listitem>
- <para>Instance name – a unique, immutable ID that is generated by &PRODUCT; and can not
- be modified by the user. This name conforms to the requirements in IETF RFC 1123.</para>
- </listitem>
- <listitem>
- <para>Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user.
- Defaults to instance name.</para>
- </listitem>
- <listitem>
- <para>Name – host name that the DHCP server assigns to the VM. Can be set by the user.
- Defaults to instance name</para>
- </listitem>
- </itemizedlist>
- <note>
- <para>You can append the display name of a guest VM to its internal name. For more information,
- see <xref linkend="append-displayname-vms"/>.</para>
- </note>
- <para>Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by
- the system. If the system detects that the VM is down, it will attempt to restart the VM,
- possibly on a different host. For more information, see HA-Enabled Virtual Machines on </para>
- <para>Each new VM is allocated one public IP address. When the VM is started, &PRODUCT;
- automatically creates a static NAT between this public IP address and the private IP address of
- the VM.</para>
- <para>If elastic IP is in use (with the NetScaler load balancer), the IP address initially
- allocated to the new VM is not marked as elastic. The user must replace the automatically
- configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between
- this new IP and the guest VM’s private IP. The VM’s original IP address is then released and
- returned to the pool of available public IPs. Optionally, you can also decide not to allocate a
- public IP to a VM in an EIP-enabled Basic zone. For more information on Elastic IP, see <xref
- linkend="elastic-ip"/>.</para>
- <para>&PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the
- “shutdown” command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut
- down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go
- through the &PRODUCT; UI or API.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/about-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-zones.xml b/docs/en-US/about-zones.xml
deleted file mode 100644
index 2a4eeb4..0000000
--- a/docs/en-US/about-zones.xml
+++ /dev/null
@@ -1,74 +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="about-zones">
- <title>About Zones</title>
- <para>A zone is the second largest organizational unit within a &PRODUCT; deployment. A zone
- typically corresponds to a single datacenter, although it is permissible to have multiple
- zones in a datacenter. The benefit of organizing infrastructure into zones is to provide
- physical isolation and redundancy. For example, each zone can have its own power supply and
- network uplink, and the zones can be widely separated geographically (though this is not
- required).</para>
- <para>A zone consists of:</para>
- <itemizedlist>
- <listitem><para>One or more pods. Each pod contains one or more clusters of hosts and one or more primary storage servers.</para></listitem>
- <listitem><para>A zone may contain one or more primary storage servers, which are shared by all the pods in the zone.</para></listitem>
- <listitem><para>Secondary storage, which is shared by all the pods in the zone.</para></listitem>
- </itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/zone-overview.png" />
- </imageobject>
- <textobject><phrase>zone-overview.png: Nested structure of a simple zone.</phrase></textobject>
- </mediaobject>
- <para>Zones are visible to the end user. When a user starts a guest VM, the user must select a zone for their guest. Users might also be required to copy their private templates to additional zones to enable creation of guest VMs using their templates in those zones.</para>
- <para>Zones can be public or private. Public zones are visible to all users. This means that any user may create a guest in that zone. Private zones are reserved for a specific domain. Only users in that domain or its subdomains may create guests in that zone.</para>
- <para>Hosts in the same zone are directly accessible to each other without having to go through a firewall. Hosts in different zones can access each other through statically configured VPN tunnels.</para>
- <para>For each zone, the administrator must decide the following.</para>
- <itemizedlist>
- <listitem><para>How many pods to place in each zone.</para></listitem>
- <listitem><para>How many clusters to place in each pod.</para></listitem>
- <listitem><para>How many hosts to place in each cluster.</para></listitem>
- <listitem><para>(Optional) How many primary storage servers to place in each zone and total capacity for these storage servers.</para></listitem>
- <listitem><para>How many primary storage servers to place in each cluster and total capacity for these storage servers.</para></listitem>
- <listitem><para>How much secondary storage to deploy in a zone.</para></listitem>
- </itemizedlist>
- <para>When you add a new zone using the &PRODUCT; UI, you will be prompted to configure the zone’s physical network
- and add the first pod, cluster, host, primary storage, and secondary storage.</para>
- <para>In order to support zone-wide functions for VMware, &PRODUCT; is aware of VMware Datacenters and can map each Datacenter to a
- &PRODUCT; zone. To enable features like storage live migration and zone-wide
- primary storage for VMware hosts, &PRODUCT; has to make sure that a zone
- contains only a single VMware Datacenter. Therefore, when you are creating a new
- &PRODUCT; zone, you can select a VMware Datacenter for the zone. If you
- are provisioning multiple VMware Datacenters, each one will be set up as a single zone
- in &PRODUCT;. </para>
- <note>
- <para>If you are upgrading from a previous &PRODUCT; version, and your existing
- deployment contains a zone with clusters from multiple VMware Datacenters, that zone
- will not be forcibly migrated to the new model. It will continue to function as
- before. However, any new zone-wide operations, such as zone-wide primary storage
- and live storage migration, will
- not be available in that zone.</para>
- </note>
- <para/>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/accept-membership-invite.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accept-membership-invite.xml b/docs/en-US/accept-membership-invite.xml
deleted file mode 100644
index dc59d00..0000000
--- a/docs/en-US/accept-membership-invite.xml
+++ /dev/null
@@ -1,36 +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="accept-membership-invite">
- <title>Accepting a Membership Invitation</title>
- <para>If you have received an invitation to join a &PRODUCT; project, and you want to accept the invitation, follow these steps:</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
- <listitem><para>In the left navigation, click Projects.</para></listitem>
- <listitem><para>In Select View, choose Invitations.</para></listitem>
- <listitem><para>If you see the invitation listed onscreen, click the Accept button.</para> <para>Invitations listed on screen were sent to you using your &PRODUCT; account name.</para></listitem>
- <listitem><para>If you received an email invitation, click the Enter Token button, and provide the project ID and unique ID code (token) from the email.</para></listitem>
- </orderedlist>
- </section>
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/accessing-system-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accessing-system-vms.xml b/docs/en-US/accessing-system-vms.xml
deleted file mode 100755
index e1b6090..0000000
--- a/docs/en-US/accessing-system-vms.xml
+++ /dev/null
@@ -1,66 +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="accessing-system-vms">
- <title>Accessing System VMs</title>
- <para>It may sometimes be necessary to access System VMs for diagnostics of certain issues, for example if you are experiencing SSVM (Secondary Storage VM) connection issues. Use the steps below in order to connect to the SSH console of a running System VM.</para>
- <para>
- Accessing System VMs over the network requires the use of private keys and connecting to System VMs SSH Daemon on port 3922.
- XenServer/KVM Hypervisors store this key at /root/.ssh/id_rsa.cloud on each &PRODUCT; agent.
- To access System VMs running on ESXi, the key is stored on the management server at /var/lib/cloudstack/management/.ssh/id_rsa.
- </para>
- <orderedlist>
- <listitem>
- <para>Find the details of the System VM</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
- <listitem><para>Click Infrastructure, then System VMs, and then click the name of a running VM.</para></listitem>
- <listitem><para>Take a note of the 'Host', 'Private IP Address' and 'Link Local IP Address' of the System VM you wish to access.</para></listitem>
- </orderedlist>
- <para><inlinegraphic format="PNG" fileref="images/view-systemvm-details.png"/></para>
- </listitem>
- <listitem>
- <para>XenServer/KVM Hypervisors</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Connect to the Host of which the System VM is running.</para></listitem>
- <listitem><para>SSH the 'Link Local IP Address' of the System VM from the Host on which the VM is running.</para></listitem>
- <listitem><para>Format: ssh -i <path-to-private-key> <link-local-ip> -p 3922</para></listitem>
- <listitem><para>Example: root@faith:~# ssh -i /root/.ssh/id_rsa.cloud 169.254.3.93 -p 3922</para></listitem>
- </orderedlist>
- </listitem>
- <listitem>
- <para>ESXi Hypervisors</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Connect to your &PRODUCT; Management Server.</para></listitem>
- <listitem><para>ESXi users should SSH to the private IP address of the System VM.</para></listitem>
- <listitem><para>Format: ssh -i <path-to-private-key> <vm-private-ip> -p 3922</para></listitem>
- <listitem><para>Example: root@management:~# ssh -i /var/lib/cloudstack/management/.ssh/id_rsa 172.16.0.250 -p 3922</para></listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
-
-
-
-
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/accessing-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accessing-vms.xml b/docs/en-US/accessing-vms.xml
deleted file mode 100644
index 67d9d77..0000000
--- a/docs/en-US/accessing-vms.xml
+++ /dev/null
@@ -1,40 +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="accessing-vms">
- <title>Accessing VMs</title>
- <para>Any user can access their own virtual machines. The administrator can access all VMs running in the cloud.</para>
- <para>To access a VM through the &PRODUCT; UI:</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>Click Instances, then click the name of a running VM.</para></listitem>
- <listitem><para>Click the View Console button <inlinegraphic format="PNG" fileref="images/view-console-button.png"/>.</para></listitem>
- </orderedlist>
- <para>To access a VM directly over the network:</para>
- <orderedlist>
- <listitem><para>The VM must have some port open to incoming traffic. For example, in a basic zone, a new VM might be assigned to a security group which allows incoming traffic. This depends on what security group you picked when creating the VM. In other cases, you can open a port by setting up a port forwarding policy. See <xref linkend="ip-forwarding-firewalling"/>.</para></listitem>
- <listitem><para>If a port is open but you can not access the VM using ssh, it’s possible that ssh is not already enabled on the VM. This will depend on whether ssh is enabled in the template you picked when creating the VM. Access the VM through the &PRODUCT; UI and enable ssh on the machine using the commands for the VM’s operating system.</para></listitem>
- <listitem><para>If the network has an external firewall device, you will need to create a firewall rule to allow access. See <xref linkend="ip-forwarding-firewalling"/>.</para></listitem>
- </orderedlist>
-</section>
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/accounts-users-domains.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accounts-users-domains.xml b/docs/en-US/accounts-users-domains.xml
deleted file mode 100644
index 3accbbe..0000000
--- a/docs/en-US/accounts-users-domains.xml
+++ /dev/null
@@ -1,133 +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="accounts-users-domains">
- <title>Accounts, Users, and Domains</title>
- <formalpara>
- <title>Accounts</title>
- <para>An account typically represents a customer of the service provider or a department in a large organization. Multiple users can exist in an account.</para>
- </formalpara>
- <formalpara>
- <title>Domains</title>
- <para>Accounts are grouped by domains. Domains usually contain multiple accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.</para>
- </formalpara>
- <para>For each account created, the Cloud installation creates three different types of user accounts: root administrator, domain administrator, and user.</para>
- <formalpara>
- <title>Users</title>
- <para>Users are like aliases in the account. Users in the same account are not isolated from each other, but they are isolated from users in other accounts. Most installations need not surface the notion of users; they just have one user per account. The same user cannot belong to multiple accounts.</para>
- </formalpara>
- <para>Username is unique in a domain across accounts in that domain. The same username can exist in other domains, including sub-domains. Domain name can repeat only if the full pathname from root is unique. For example, you can create root/d1, as well as root/foo/d1, and root/sales/d1.</para>
- <para>Administrators are accounts with special privileges in the system. There may be multiple administrators in the system. Administrators can create or delete other administrators, and change the password for any user in the system.</para>
- <formalpara>
- <title>Domain Administrators</title>
- <para>Domain administrators can perform administrative operations for users who belong to that domain. Domain administrators do not have visibility into physical servers or other domains.</para>
- </formalpara>
- <formalpara>
- <title>Root Administrator</title>
- <para>Root administrators have complete access to the system, including managing templates, service offerings, customer care administrators, and domains</para>
- </formalpara>
- <formalpara>
- <title>Resource Ownership</title>
- <para>Resources belong to the account, not individual users in that account. For example,
- billing, resource limits, and so on are maintained by the account, not the users. A user
- can operate on any resource in the account provided the user has privileges for that
- operation. The privileges are determined by the role. A root administrator can change
- the ownership of any virtual machine from one account to any other account by using the
- assignVirtualMachine API. A domain or sub-domain administrator can do the same for VMs
- within the domain from one account to any other account in the domain or any of its
- sub-domains.</para>
- </formalpara>
- <section id="dedicated-host-cluster-pod">
- <title>Dedicating Resources to Accounts and Domains</title>
- <para>The root administrator can dedicate resources to a specific domain or account
- that needs private infrastructure for additional security or performance guarantees.
- A zone, pod, cluster, or host can be reserved by the root administrator for a specific domain or account.
- Only users in that domain or its subdomain may use the infrastructure.
- For example, only users in a given domain can create guests in a zone dedicated to that domain.</para>
- <para>There are several types of dedication available:</para>
- <itemizedlist>
- <listitem>
- <para>Explicit dedication. A zone, pod, cluster, or host is dedicated to an account or
- domain by the root administrator during initial deployment and
- configuration.</para></listitem>
- <listitem><para>Strict implicit dedication. A host will not be shared across multiple accounts. For example,
- strict implicit dedication is useful for deployment of certain types of
- applications, such as desktops, where no host can be shared
- between different accounts without violating the desktop software's terms of license.</para></listitem>
- <listitem><para>Preferred implicit dedication. The VM will be deployed in dedicated infrastructure if
- possible. Otherwise, the VM can be deployed in shared
- infrastructure.</para></listitem>
- </itemizedlist>
- <section id="dedication-how-to">
- <title>How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain</title>
- <para>For explicit dedication: When deploying a new zone, pod, cluster, or host, the
- root administrator can click the Dedicated checkbox, then choose a domain or account
- to own the resource.</para>
- <para>To explicitly dedicate an existing zone, pod, cluster, or host: log in as the root admin,
- find the resource in the UI, and click the Dedicate button. <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/dedicate-resource-button.png"/>
- </imageobject>
- <textobject>
- <phrase>dedicate-resource-button.png: button to dedicate a zone, pod, cluster, or host</phrase>
- </textobject>
- </inlinemediaobject></para>
- <para>For implicit dedication: The administrator creates a compute service offering and
- in the Deployment Planner field, chooses ImplicitDedicationPlanner. Then in Planner
- Mode, the administrator specifies either Strict or Preferred, depending on whether
- it is permissible to allow some use of shared resources when dedicated resources are
- not available. Whenever a user creates a VM based on this service offering, it is
- allocated on one of the dedicated hosts.</para>
- </section>
- <section id="using-dedication-how-to">
- <title>How to Use Dedicated Hosts</title>
- <para>To use an explicitly dedicated host, use the explicit-dedicated type of affinity
- group (see <xref linkend="affinity-groups"/>). For example, when creating a new VM,
- an end user can choose to place it on dedicated infrastructure. This operation will
- succeed only if some infrastructure has already been assigned as dedicated to the
- user's account or domain.</para>
- </section>
- <section id="dedicated-infrastructure-behavior">
- <title>Behavior of Dedicated Hosts, Clusters, Pods, and Zones</title>
- <para>The administrator can live migrate VMs away from dedicated hosts if desired, whether the destination
- is a host reserved for a different account/domain or a host that is shared (not dedicated to any particular account or domain).
- &PRODUCT; will generate an alert, but the operation is allowed.</para>
- <para>Dedicated hosts can be used in conjunction with host tags. If both a host tag and dedication are requested,
- the VM will be placed only on a host that meets both requirements. If there is no dedicated resource available
- to that user that also has the host tag requested by the user, then the VM will not deploy.</para>
- <para>If you delete an account or domain, any hosts, clusters, pods, and zones that were
- dedicated to it are freed up. They will now be available to be shared by any account
- or domain, or the administrator may choose to re-dedicate them to a different
- account or domain.</para>
- <para>System VMs and virtual routers affect the behavior of host dedication.
- System VMs and virtual routers are owned by the &PRODUCT; system account,
- and they can be deployed on any host. They do not adhere to explicit dedication.
- The presence of system vms and virtual routers on a host makes it unsuitable for strict implicit dedication.
- The host can not be used for strict implicit dedication,
- because the host already has VMs of a specific account (the default system account).
- However, a host with system VMs or virtual routers can be used
- for preferred implicit dedication.
- </para>
- </section>
- </section>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/accounts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accounts.xml b/docs/en-US/accounts.xml
deleted file mode 100644
index 1c4454c..0000000
--- a/docs/en-US/accounts.xml
+++ /dev/null
@@ -1,29 +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.
--->
-
-<chapter id="accounts">
- <title>Accounts</title>
- <xi:include href="accounts-users-domains.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="LDAP-for-user-authentication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/acquire-new-ip-address.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/acquire-new-ip-address.xml b/docs/en-US/acquire-new-ip-address.xml
deleted file mode 100644
index 3dbd79e..0000000
--- a/docs/en-US/acquire-new-ip-address.xml
+++ /dev/null
@@ -1,52 +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="acquire-new-ip-address">
- <title>Acquiring a New IP Address</title>
- <orderedlist>
- <listitem>
- <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
- </listitem>
- <listitem>
- <para>In the left navigation, choose Network.</para>
- </listitem>
- <listitem>
- <para>Click the name of the network where you want to work with.</para>
- </listitem>
- <listitem>
- <para>Click View IP Addresses.</para>
- </listitem>
- <listitem>
- <para>Click Acquire New IP.</para>
- <para>The Acquire New IP window is displayed.</para>
- </listitem>
- <listitem>
- <para>Specify whether you want cross-zone IP or not.</para>
- <para>If you want Portable IP click Yes in the confirmation dialog. If you want a normal
- Public IP click No.</para>
- <para>For more information on Portable IP, see <xref linkend="portable-ip"/>.</para>
- <para>Within a few moments, the new IP address should appear with the state Allocated. You can
- now use the IP address in port forwarding or static NAT rules.</para>
- </listitem>
- </orderedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/acquire-new-ip-for-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/acquire-new-ip-for-vpc.xml b/docs/en-US/acquire-new-ip-for-vpc.xml
deleted file mode 100644
index c0cb876..0000000
--- a/docs/en-US/acquire-new-ip-for-vpc.xml
+++ /dev/null
@@ -1,88 +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="acquire-new-ip-for-vpc">
- <title>Acquiring a New IP Address for a VPC</title>
- <para>When you acquire an IP address, all IP addresses are allocated to VPC, not to the guest
- networks within the VPC. The IPs are associated to the guest network only when the first
- port-forwarding, load balancing, or Static NAT rule is created for the IP or the network. IP
- can't be associated to more than one network at a time.</para>
- <orderedlist>
- <listitem>
- <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
- </listitem>
- <listitem>
- <para>In the left navigation, choose Network.</para>
- </listitem>
- <listitem>
- <para>In the Select view, select VPC.</para>
- <para>All the VPCs that you have created for the account is listed in the page.</para>
- </listitem>
- <listitem>
- <para>Click the Configure button of the VPC to which you want to deploy the VMs.</para>
- <para>The VPC page is displayed where all the tiers you created are listed in a
- diagram.</para>
- <para>The following options are displayed.</para>
- <itemizedlist>
- <listitem>
- <para>Internal LB</para>
- </listitem>
- <listitem>
- <para>Public LB IP</para>
- </listitem>
- <listitem>
- <para>Static NAT</para>
- </listitem>
- <listitem>
- <para>Virtual Machines</para>
- </listitem>
- <listitem>
- <para>CIDR</para>
- </listitem>
- </itemizedlist>
- <para>The following router information is displayed:</para>
- <itemizedlist>
- <listitem>
- <para>Private Gateways</para>
- </listitem>
- <listitem>
- <para>Public IP Addresses</para>
- </listitem>
- <listitem>
- <para>Site-to-Site VPNs</para>
- </listitem>
- <listitem>
- <para>Network ACL Lists</para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>Select IP Addresses.</para>
- <para>The Public IP Addresses page is displayed.</para>
- </listitem>
- <listitem>
- <para>Click Acquire New IP, and click Yes in the confirmation dialog.</para>
- <para>You are prompted for confirmation because, typically, IP addresses are a limited
- resource. Within a few moments, the new IP address should appear with the state Allocated.
- You can now use the IP address in port forwarding, load balancing, and static NAT
- rules.</para>
- </listitem>
- </orderedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/add-additional-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-additional-guest-network.xml b/docs/en-US/add-additional-guest-network.xml
deleted file mode 100644
index c684da0..0000000
--- a/docs/en-US/add-additional-guest-network.xml
+++ /dev/null
@@ -1,65 +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="add-additional-guest-network">
- <title>Adding an Additional Guest Network</title>
- <orderedlist>
- <listitem>
- <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
- </listitem>
- <listitem>
- <para>In the left navigation, choose Network.</para>
- </listitem>
- <listitem>
- <para>Click Add guest network. Provide the following information: </para>
- <itemizedlist>
- <listitem>
- <para><emphasis role="bold">Name</emphasis>: The name of the network. This will be
- user-visible. </para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">Display Text</emphasis>: The description of the network. This
- will be user-visible.</para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">Zone</emphasis>. The name of the zone this network applies to.
- Each zone is a broadcast domain, and therefore each zone has a different IP range for
- the guest network. The administrator must configure the IP range for each zone.</para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">Network offering</emphasis>: If the administrator has
- configured multiple network offerings, select the one you want to use for this
- network.</para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should
- use.</para>
- </listitem>
- <listitem>
- <para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the
- guests will use.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>Click Create.</para>
- </listitem>
- </orderedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/add-clusters-kvm-xenserver.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-clusters-kvm-xenserver.xml b/docs/en-US/add-clusters-kvm-xenserver.xml
deleted file mode 100644
index ad57371..0000000
--- a/docs/en-US/add-clusters-kvm-xenserver.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="add-clusters-kvm-xenserver">
- <title>Add Cluster: KVM or XenServer</title>
- <para>These steps assume you have already installed the hypervisor on the hosts and logged in to
- the &PRODUCT; UI.</para>
- <orderedlist>
- <listitem>
- <para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the
- zone in which you want to add the cluster.</para>
- </listitem>
- <listitem>
- <para>Click the Compute tab.</para>
- </listitem>
- <listitem>
- <para>In the Clusters node of the diagram, click View All.</para>
- </listitem>
- <listitem>
- <para>Click Add Cluster.</para>
- </listitem>
- <listitem>
- <para>Choose the hypervisor type for this cluster.</para>
- </listitem>
- <listitem>
- <para>Choose the pod in which you want to create the cluster.</para>
- </listitem>
- <listitem>
- <para>Enter a name for the cluster. This can be text of your choosing and is not used by
- &PRODUCT;.</para>
- </listitem>
- <listitem>
- <para>Click OK.</para>
- </listitem>
- </orderedlist>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/add-clusters-ovm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-clusters-ovm.xml b/docs/en-US/add-clusters-ovm.xml
deleted file mode 100644
index d0b0688..0000000
--- a/docs/en-US/add-clusters-ovm.xml
+++ /dev/null
@@ -1,43 +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="add-clusters-ovm">
- <title>Add Cluster: OVM</title>
- <para>To add a Cluster of hosts that run Oracle VM (OVM):</para>
- <orderedlist>
- <listitem><para>Add a companion non-OVM cluster to the Pod. This cluster provides an environment where the &PRODUCT; System VMs can run. You should have already installed a non-OVM hypervisor on at least one Host to prepare for this step. Depending on which hypervisor you used:</para>
- <itemizedlist>
- <listitem><para>For VMWare, follow the steps in <xref linkend="add-clusters-vsphere"/>. When finished, return here and continue with the next step.</para></listitem>
- <listitem><para>For KVM or XenServer, follow the steps in <xref linkend="add-clusters-kvm-xenserver"/>. When finished, return here and continue with the next step</para></listitem>
- </itemizedlist>
- </listitem>
- <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View All, then click the zone in which you want to add the cluster.</para></listitem>
- <listitem><para>Click the Compute and Storage tab. In the Pods node, click View All.</para></listitem>
- <listitem><para>Click View Clusters, then click Add Cluster.</para>
- <para>The Add Cluster dialog is displayed.</para></listitem>
- <listitem><para>In Hypervisor, choose OVM.</para></listitem>
- <listitem><para>In Cluster, enter a name for the cluster.</para></listitem>
- <listitem><para>Click Add.</para></listitem>
- </orderedlist>
-</section>