incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [27/29] cleaning up docs temp, publish directories - adding gitignore entries for them for the future
Date Mon, 19 Nov 2012 14:11:29 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vlan-provisioning.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vlan-provisioning.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vlan-provisioning.html
deleted file mode 100644
index 61ca5c6..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vlan-provisioning.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>11.9. VLAN Provisioning</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="working-with-hosts.html" title="Chapter 11. Working With Hosts" /><link rel="prev" href="host-allocation.html" title="11.8. Host Allocation" /><link rel="next" href="working-with-templates.html" title="Chapter 12. Working with Templates" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="host-allocation.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n"
  href="working-with-templates.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="vlan-provisioning" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="vlan-provisioning">11.9. VLAN Provisioning</h2></div></div></div><div class="para">
-		CloudStack automatically creates and destroys interfaces bridged to VLANs on the hosts. In general the administrator does not need to manage this process.
-	</div><div class="para">
-		CloudStack manages VLANs differently based on hypervisor type. For XenServer or KVM, the VLANs are created on only the hosts where they will be used and then they are destroyed when all guests that require them have been terminated or moved to another host.
-	</div><div class="para">
-		For vSphere the VLANs are provisioned on all hosts in the cluster even if there is no guest running on a particular Host that requires the VLAN. This allows the administrator to perform live migration and other functions in vCenter without having to create the VLAN on the destination Host. Additionally, the VLANs are not removed from the Hosts when they are no longer needed.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="host-allocation.html"><strong>Prev</strong>11.8. Host Allocation</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="working-with-templates.html"><strong>Next</strong>Chapter 12. Working with Templates</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vm-lifecycle.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vm-lifecycle.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vm-lifecycle.html
deleted file mode 100644
index f49fbd8..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vm-lifecycle.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.3. VM Lifecycle</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="virtual-machines.html" title="Chapter 10. Working With Virtual Machines" /><link rel="prev" href="best-practices-vm.html" title="10.2. Best Practices for Virtual Machines" /><link rel="next" href="creating-vms.html" title="10.4. Creating VMs" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="best-practices-vm.html"><strong>Prev</strong></a></li><li class="next"><a accessk
 ey="n" href="creating-vms.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="vm-lifecycle" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="vm-lifecycle">10.3. VM Lifecycle</h2></div></div></div><div class="para">
-		Virtual machines can be in the following states:
-	</div><div class="mediaobject"><img src="./images/basic-deployment.png" alt="basic-deployment.png: Basic two-machine CloudStack deployment" /></div><div class="para">
-		Once a virtual machine is destroyed, it cannot be recovered. All the resources used by the virtual machine will be reclaimed by the system. This includes the virtual machine’s IP address.
-	</div><div class="para">
-		A stop will attempt to gracefully shut down the operating system, which typically involves terminating all the running applications. If the operation system cannot be stopped, it will be forcefully terminated. This has the same effect as pulling the power cord to a physical machine.
-	</div><div class="para">
-		A reboot is a stop followed by a start.
-	</div><div class="para">
-		CloudPlatform preserves the state of the virtual machine hard disk until the machine is destroyed.
-	</div><div class="para">
-		A running virtual machine may fail because of hardware or network issues. A failed virtual machine is in the down state.
-	</div><div class="para">
-		The system places the virtual machine into the down state if it does not receive the heartbeat from the hypervisor for three minutes.
-	</div><div class="para">
-		The user can manually restart the virtual machine from the down state.
-	</div><div class="para">
-		The system will start the virtual machine from the down state automatically if the virtual machine is marked as HA-enabled.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="best-practices-vm.html"><strong>Prev</strong>10.2. Best Practices for Virtual Machines</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="creating-vms.html"><strong>Next</strong>10.4. Creating VMs</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vmware-install.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vmware-install.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vmware-install.html
deleted file mode 100644
index b9bfcca..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vmware-install.html
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>8.3. VMware vSphere Installation and Configuration</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="hypervisor-installation.html" title="Chapter 8. Hypervisor Installation" /><link rel="prev" href="citrix-xenserver-installation.html" title="8.2. Citrix XenServer Installation for CloudStack" /><link rel="next" href="choosing-a-deployment_architecture.html" title="Chapter 9. Choosing a Deployment Architecture" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Co
 mmon_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="citrix-xenserver-installation.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="choosing-a-deployment_architecture.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="vmware-install" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="vmware-install">8.3. VMware vSphere Installation and Configuration</h2></div></div></div><div class="para">
-		If you want to use the VMware vSphere hypervisor to run guest virtual machines, install vSphere on the host(s) in your cloud.
-	</div><div xml:lang="en-US" class="section" id="vmware-requirements" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="vmware-requirements">8.3.1. System Requirements for vSphere Hosts</h3></div></div></div><div class="section" id="vmware-requirements-software"><div class="titlepage"><div><div><h4 class="title" id="vmware-requirements-software">8.3.1.1. Software requirements:</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					vSphere and vCenter, both version 4.1 or 5.0.
-				</div><div class="para">
-					vSphere Standard is recommended. Note however that customers need to consider the CPU constraints in place with vSphere licensing. See <a href="http://www.vmware.com/files/pdf/vsphere_pricing.pdf">http://www.vmware.com/files/pdf/vsphere_pricing.pdf</a> and discuss with your VMware sales representative.
-				</div><div class="para">
-					vCenter Server Standard is recommended.
-				</div></li><li class="listitem"><div class="para">
-					Be sure all the hotfixes provided by the hypervisor vendor are applied. Track the release of hypervisor patches through your hypervisor vendor's support channel, and apply patches as soon as possible after they are released. CloudStack will not track or notify you of required hypervisor patches. It is essential that your hosts are completely up to date with the provided hypervisor patches. The hypervisor vendor is likely to refuse to support any system that is not up to date with patches.
-				</div></li></ul></div><div class="warning"><div class="admonition_header"><h2>Apply All Necessary Hotfixes</h2></div><div class="admonition"><div class="para">
-				The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
-			</div></div></div></div><div class="section" id="vmware-requirements-hardware"><div class="titlepage"><div><div><h4 class="title" id="vmware-requirements-hardware">8.3.1.2. Hardware requirements:</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					The host must be certified as compatible with vSphere. See the VMware Hardware Compatibility Guide at <a href="http://www.vmware.com/resources/compatibility/search.php">http://www.vmware.com/resources/compatibility/search.php</a>.
-				</div></li><li class="listitem"><div class="para">
-					All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).
-				</div></li><li class="listitem"><div class="para">
-					All hosts within a cluster must be homogenous. That means the CPUs must be of the same type, count, and feature flags.
-				</div></li><li class="listitem"><div class="para">
-					64-bit x86 CPU (more cores results in better performance)
-				</div></li><li class="listitem"><div class="para">
-					Hardware virtualization support required
-				</div></li><li class="listitem"><div class="para">
-					4 GB of memory
-				</div></li><li class="listitem"><div class="para">
-					36 GB of local disk
-				</div></li><li class="listitem"><div class="para">
-					At least 1 NIC
-				</div></li><li class="listitem"><div class="para">
-					Statically allocated IP Address
-				</div></li></ul></div></div><div class="section" id="vmware-requirements-vcenter"><div class="titlepage"><div><div><h4 class="title" id="vmware-requirements-vcenter">8.3.1.3. vCenter Server requirements:</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					Processor - 2 CPUs 2.0GHz or higher Intel or AMD x86 processors. Processor requirements may be higher if the database runs on the same machine.
-				</div></li><li class="listitem"><div class="para">
-					Memory - 3GB RAM. RAM requirements may be higher if your database runs on the same machine.
-				</div></li><li class="listitem"><div class="para">
-					Disk storage - 2GB. Disk requirements may be higher if your database runs on the same machine.
-				</div></li><li class="listitem"><div class="para">
-					Microsoft SQL Server 2005 Express disk requirements. The bundled database requires up to 2GB free disk space to decompress the installation archive.
-				</div></li><li class="listitem"><div class="para">
-					Networking - 1Gbit or 10Gbit.
-				</div></li></ul></div><div class="para">
-			For more information, see "vCenter Server and the vSphere Client Hardware Requirements" at <a href="http://pubs.vmware.com/vsp40/wwhelp/wwhimpl/js/html/wwhelp.htm#href=install/c_vc_hw.html">http://pubs.vmware.com/vsp40/wwhelp/wwhimpl/js/html/wwhelp.htm#href=install/c_vc_hw.html</a>.
-		</div></div><div class="section" id="vmware-requirements-other"><div class="titlepage"><div><div><h4 class="title" id="vmware-requirements-other">8.3.1.4. Other requirements:</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					VMware vCenter Standard Edition 4.1 or 5.0 must be installed and available to manage the vSphere hosts.
-				</div></li><li class="listitem"><div class="para">
-					vCenter must be configured to use the standard port 443 so that it can communicate with the CloudStack Management Server.
-				</div></li><li class="listitem"><div class="para">
-					You must re-install VMware ESXi if you are going to re-use a host from a previous install.
-				</div></li><li class="listitem"><div class="para">
-					CloudStack requires VMware vSphere 4.1 or 5.0. VMware vSphere 4.0 is not supported.
-				</div></li><li class="listitem"><div class="para">
-					All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled). All hosts within a cluster must be homogenous. That means the CPUs must be of the same type, count, and feature flags.
-				</div></li><li class="listitem"><div class="para">
-					The CloudStack management network must not be configured as a separate virtual network. The CloudStack management network is the same as the vCenter management network, and will inherit its configuration. See <a class="xref" href="vmware-install.html#vmware-physical-host-networking-config-vcenter-mgt">Section 8.3.5.2, “Configure vCenter Management Network”</a>.
-				</div></li><li class="listitem"><div class="para">
-					CloudStack requires ESXi. ESX is not supported.
-				</div></li><li class="listitem"><div class="para">
-					All resources used for CloudStack must be used for CloudStack only. CloudStack cannot share instance of ESXi or storage with other management consoles. Do not share the same storage volumes that will be used by CloudStack with a different set of ESXi servers that are not managed by CloudStack.
-				</div></li><li class="listitem"><div class="para">
-					Put all target ESXi hypervisors in a cluster in a separate Datacenter in vCenter.
-				</div></li><li class="listitem"><div class="para">
-					The cluster that will be managed by CloudStack should not contain any VMs. Do not run the management server, vCenter or any other VMs on the cluster that is designated for CloudStack use. Create a separate cluster for use of CloudStack and make sure that they are no VMs in this cluster.
-				</div></li><li class="listitem"><div class="para">
-					All the required VLANS must be trunked into all network switches that are connected to the ESXi hypervisor hosts. These would include the VLANS for Management, Storage, vMotion, and guest VLANs. The guest VLAN (used in Advanced Networking; see Network Setup) is a contiguous range of VLANs that will be managed by CloudStack. 
-				</div></li></ul></div></div></div><div class="section" id="vmware-preparation-checklist"><div class="titlepage"><div><div><h3 class="title" id="vmware-preparation-checklist">8.3.2. Preparation Checklist for VMware</h3></div></div></div><div class="para">
-			For a smoother installation, gather the following information before you start:
-		</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					Information listed in <a class="xref" href="vmware-install.html#vmware-vcenter-checklist">Section 8.3.2.1, “vCenter Checklist”</a>
-				</div></li><li class="listitem"><div class="para">
-					Information listed in <a class="xref" href="vmware-install.html#vmware-network-checklist">Section 8.3.2.2, “Networking Checklist for VMware”</a>
-				</div></li></ul></div><div class="section" id="vmware-vcenter-checklist"><div class="titlepage"><div><div><h4 class="title" id="vmware-vcenter-checklist">8.3.2.1. vCenter Checklist</h4></div></div></div><div class="para">
-				You will need the following information about vCenter.
-			</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="33%" /><col align="left" class="c2" width="33%" /><col align="left" class="c3" width="33%" /></colgroup><thead><tr><th align="left">
-								<div class="para">
-									vCenter Requirement
-								</div>
-							</th><th align="left">
-								<div class="para">
-									Value
-								</div>
-							</th><th align="left">
-								<div class="para">
-									Notes
-								</div>
-							</th></tr></thead><tbody><tr><td align="left">
-								<div class="para">
-									vCenter User
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									This user must have admin privileges.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									vCenter User Password
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									Password for the above user.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									vCenter Datacenter Name
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									Name of the datacenter.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									vCenter Cluster Name
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									Name of the cluster.
-								</div>
-							</td></tr></tbody></table></div></div><div class="section" id="vmware-network-checklist"><div class="titlepage"><div><div><h4 class="title" id="vmware-network-checklist">8.3.2.2. Networking Checklist for VMware</h4></div></div></div><div class="para">
-				You will need the following information about VLAN.
-			</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="33%" /><col align="left" class="c2" width="33%" /><col align="left" class="c3" width="33%" /></colgroup><thead><tr><th align="left">
-								<div class="para">
-									VLAN Information
-								</div>
-							</th><th align="left">
-								<div class="para">
-									Value
-								</div>
-							</th><th align="left">
-								<div class="para">
-									Notes
-								</div>
-							</th></tr></thead><tbody><tr><td align="left">
-								<div class="para">
-									ESXi VLAN
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									VLAN on which all your ESXi hypervisors reside.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									ESXI VLAN IP Address
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									IP Address Range in the ESXi VLAN. One address per Virtual Router is used from this range.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									ESXi VLAN IP Gateway
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									ESXi VLAN Netmask
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									Management Server VLAN
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									VLAN on which the CloudStack Management server is installed.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									Public VLAN
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									VLAN for the Public Network.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									Public VLAN Gateway
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									Public VLAN Netmask
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									Public VLAN IP Address Range
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									Range of Public IP Addresses available for CloudStack use. These addresses will be used for virtual router on CloudStack to route private traffic to external networks.
-								</div>
-							</td></tr><tr><td align="left">
-								<div class="para">
-									VLAN Range for Customer use
-								</div>
-							</td><td align="left">
-								<div class="para">
-								</div>
-							</td><td align="left">
-								<div class="para">
-									A contiguous range of non-routable VLANs. One VLAN will be assigned for each customer.
-								</div>
-							</td></tr></tbody></table></div></div></div><div class="section" id="vmware-vsphere-installation-steps"><div class="titlepage"><div><div><h3 class="title" id="vmware-vsphere-installation-steps">8.3.3. vSphere Installation Steps</h3></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-					If you haven't already, you'll need to download and purchase vSphere from the VMware Website (<a href="https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1">https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1</a>) and install it by following the VMware vSphere Installation Guide.
-				</div></li><li class="listitem"><div class="para">
-					Following installation, perform the following configuration, which are described in the next few sections:
-				</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="50%" /><col align="left" class="c2" width="50%" /></colgroup><thead><tr><th align="left">
-									<div class="para">
-										Required
-									</div>
-								</th><th align="left">
-									<div class="para">
-										Optional
-									</div>
-								</th></tr></thead><tbody><tr><td align="left">
-									<div class="para">
-										ESXi host setup
-									</div>
-								</td><td align="left">
-									<div class="para">
-										NIC bonding
-									</div>
-								</td></tr><tr><td align="left">
-									<div class="para">
-										Configure host physical networking, virtual switch, vCenter Management Network, and extended port range
-									</div>
-								</td><td align="left">
-									<div class="para">
-										Multipath storage
-									</div>
-								</td></tr><tr><td align="left">
-									<div class="para">
-										Prepare storage for iSCSI
-									</div>
-								</td><td align="left">
-									<div class="para">
-									</div>
-								</td></tr><tr><td align="left">
-									<div class="para">
-										Configure clusters in vCenter and add hosts to them, or add hosts without clusters to vCenter
-									</div>
-								</td><td align="left">
-									<div class="para">
-									</div>
-								</td></tr></tbody></table></div></li></ol></div></div><div class="section" id="vmware-esxi-host-setup"><div class="titlepage"><div><div><h3 class="title" id="vmware-esxi-host-setup">8.3.4. ESXi Host setup</h3></div></div></div><div class="para">
-			All ESXi hosts should enable CPU hardware virtualization support in BIOS. Please note hardware virtualization support is not enabled by default on most servers.
-		</div></div><div class="section" id="vmware-physical-host-networking"><div class="titlepage"><div><div><h3 class="title" id="vmware-physical-host-networking">8.3.5. Physical Host Networking</h3></div></div></div><div class="para">
-			You should have a plan for cabling the vSphere hosts. Proper network configuration is required before adding a vSphere host to CloudStack. To configure an ESXi host, you can use vClient to add it as standalone host to vCenter first. Once you see the host appearing in the vCenter inventory tree, click the host node in the inventory tree, and navigate to the Configuration tab.
-		</div><div class="mediaobject"><img src="./images/vmware-physical-network.png" width="444" alt="vsphereclient.png: vSphere client" /></div><div class="para">
-			In the host configuration tab, click the "Hardware/Networking" link to bring up the networking configuration page as above.
-		</div><div class="section" id="vmware-physical-host-networking-config-vswitch"><div class="titlepage"><div><div><h4 class="title" id="vmware-physical-host-networking-config-vswitch">8.3.5.1. Configure Virtual Switch</h4></div></div></div><div class="para">
-				A default virtual switch vSwitch0 is created. CloudStack requires all ESXi hosts in the cloud to use the same set of virtual switch names. If you change the default virtual switch name, you will need to configure one or more CloudStack configuration variables as well.
-			</div><div class="section" id="vmware-physical-host-networking-config-vswitch-separate-traffic"><div class="titlepage"><div><div><h5 class="title" id="vmware-physical-host-networking-config-vswitch-separate-traffic">8.3.5.1.1. Separating Traffic</h5></div></div></div><div class="para">
-					CloudStack allows you to use vCenter to configure three separate networks per ESXi host. These networks are identified by the name of the vSwitch they are connected to. The allowed networks for configuration are public (for traffic to/from the public internet), guest (for guest-guest traffic), and private (for management and usually storage traffic). You can use the default virtual switch for all three, or create one or two other vSwitches for those traffic types.
-				</div><div class="para">
-					If you want to separate traffic in this way you should first create and configure vSwitches in vCenter according to the vCenter instructions. Take note of the vSwitch names you have used for each traffic type. You will configure CloudStack to use these vSwitches.
-				</div></div><div class="section" id="vmware-physical-host-networking-config-vswitch-increasing-port"><div class="titlepage"><div><div><h5 class="title" id="vmware-physical-host-networking-config-vswitch-increasing-port">8.3.5.1.2. Increasing Ports</h5></div></div></div><div class="para">
-					By default a virtual switch on ESXi hosts is created with 56 ports. We recommend setting it to 4088, the maximum number of ports allowed. To do that, click the "Properties..." link for virtual switch (note this is not the Properties link for Networking).
-				</div><div class="mediaobject"><img src="./images/vmware-increase-ports.png" width="444" alt="vsphereclient.png: vSphere client" /></div><div class="para">
-					In vSwitch properties dialog, select the vSwitch and click Edit. You should see the following dialog:
-				</div><div class="mediaobject"><img src="./images/vmware-vswitch-properties.png" width="444" alt="vsphereclient.png: vSphere client" /></div><div class="para">
-					In this dialog, you can change the number of switch ports. After you've done that, ESXi hosts are required to reboot in order for the setting to take effect.
-				</div></div></div><div class="section" id="vmware-physical-host-networking-config-vcenter-mgt"><div class="titlepage"><div><div><h4 class="title" id="vmware-physical-host-networking-config-vcenter-mgt">8.3.5.2. Configure vCenter Management Network</h4></div></div></div><div class="para">
-				In the vSwitch properties dialog box, you may see a vCenter management network. This same network will also be used as the CloudStack management network. CloudStack requires the vCenter management network to be configured properly. Select the management network item in the dialog, then click Edit.
-			</div><div class="mediaobject"><img src="./images/vmware-mgt-network-properties.png" width="444" alt="vsphereclient.png: vSphere client" /></div><div class="para">
-				Make sure the following values are set:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						VLAN ID set to the desired ID
-					</div></li><li class="listitem"><div class="para">
-						vMotion enabled.
-					</div></li><li class="listitem"><div class="para">
-						Management traffic enabled.
-					</div></li></ul></div><div class="para">
-				If the ESXi hosts have multiple VMKernel ports, and ESXi is not using the default value "Management Network" as the management network name, you must follow these guidelines to configure the management network port group so that CloudStack can find it:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						Use one label for the management network port across all ESXi hosts.
-					</div></li><li class="listitem"><div class="para">
-						In the CloudStack UI, go to Configuration - Global Settings and set vmware.management.portgroup to the management network label from the ESXi hosts.
-					</div></li></ul></div></div><div class="section" id="vmware-physical-networking-extend-port-console-proxy"><div class="titlepage"><div><div><h4 class="title" id="vmware-physical-networking-extend-port-console-proxy">8.3.5.3. Extend Port Range for CloudStack Console Proxy</h4></div></div></div><div class="para">
-				(Applies only to VMware vSphere version 4.x)
-			</div><div class="para">
-				You need to extend the range of firewall ports that the console proxy works with on the hosts. This is to enable the console proxy to work with VMware-based VMs. The default additional port range is 59000-60000. To extend the port range, log in to the VMware ESX service console on each host and run the following commands:
-			</div><pre class="programlisting">
-esxcfg-firewall -o 59000-60000,tcp,in,vncextras
-esxcfg-firewall -o 59000-60000,tcp,out,vncextras
-</pre></div><div class="section" id="vmware-physical-networking-config-vsphere-nic-bond"><div class="titlepage"><div><div><h4 class="title" id="vmware-physical-networking-config-vsphere-nic-bond">8.3.5.4. Configure NIC Bonding for vSphere</h4></div></div></div><div class="para">
-				NIC bonding on vSphere hosts may be done according to the vSphere installation guide.
-			</div></div></div><div class="section" id="vmware-vsphere-iscsi-storage-preparation"><div class="titlepage"><div><div><h3 class="title" id="vmware-vsphere-iscsi-storage-preparation">8.3.6. Storage Preparation for vSphere (iSCSI only)</h3></div></div></div><div class="para">
-			Use of iSCSI requires preparatory work in vCenter. You must add an iSCSI target and create an iSCSI datastore.
-		</div><div class="para">
-			If you are using NFS, skip this section.
-		</div><div class="section" id="vmware-vsphere-iscsi-storage-enable-initiator"><div class="titlepage"><div><div><h4 class="title" id="vmware-vsphere-iscsi-storage-enable-initiator">8.3.6.1. Enable iSCSI initiator for ESXi hosts</h4></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-						In vCenter, go to hosts and Clusters/Configuration, and click Storage Adapters link. You will see:
-					</div><div class="mediaobject"><img src="./images/vmware-iscsi-initiator.png" width="444" alt="vsphereclient.png: vSphere client" /></div></li><li class="listitem"><div class="para">
-						Select iSCSI software adapter and click Properties.
-					</div><div class="mediaobject"><img src="./images/vmware-iscsi-initiator-properties.png" width="444" alt="vsphereclient.png: vSphere client" /></div></li><li class="listitem"><div class="para">
-						Click the Configure... button.
-					</div><div class="mediaobject"><img src="./images/vmware-iscsi-general.png" alt="vsphereclient.png: vSphere client" /></div></li><li class="listitem"><div class="para">
-						Check Enabled to enable the initiator.
-					</div></li><li class="listitem"><div class="para">
-						Click OK to save.
-					</div></li></ol></div></div><div class="section" id="vmware-vsphere-iscsi-storage-add-target"><div class="titlepage"><div><div><h4 class="title" id="vmware-vsphere-iscsi-storage-add-target">8.3.6.2. Add iSCSI target</h4></div></div></div><div class="para">
-				Under the properties dialog, add the iSCSI target info:
-			</div><div class="mediaobject"><img src="./images/vmware-iscsi-target-add.png" alt="vsphereclient.png: vSphere client" /></div><div class="para">
-				Repeat these steps for all ESXi hosts in the cluster.
-			</div></div><div class="section" id="vmware-vsphere-iscsi-storage-create-datastore"><div class="titlepage"><div><div><h4 class="title" id="vmware-vsphere-iscsi-storage-create-datastore">8.3.6.3. Create an iSCSI datastore</h4></div></div></div><div class="para">
-				You should now create a VMFS datastore. Follow these steps to do so:
-			</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-						Select Home/Inventory/Datastores.
-					</div></li><li class="listitem"><div class="para">
-						Right click on the datacenter node.
-					</div></li><li class="listitem"><div class="para">
-						Choose Add Datastore... command.
-					</div></li><li class="listitem"><div class="para">
-						Follow the wizard to create a iSCSI datastore.
-					</div></li></ol></div><div class="para">
-				This procedure should be done on one host in the cluster. It is not necessary to do this on all hosts.
-			</div><div class="mediaobject"><img src="./images/vmware-iscsi-datastore.png" width="444" alt="vsphereclient.png: vSphere client" /></div></div><div class="section" id="vmware-vsphere-iscsi-storage-multipathing"><div class="titlepage"><div><div><h4 class="title" id="vmware-vsphere-iscsi-storage-multipathing">8.3.6.4. Multipathing for vSphere (Optional)</h4></div></div></div><div class="para">
-				Storage multipathing on vSphere nodes may be done according to the vSphere installation guide.
-			</div></div></div><div class="section" id="vmware-add-hosts-config-vsphere-cluster"><div class="titlepage"><div><div><h3 class="title" id="vmware-add-hosts-config-vsphere-cluster">8.3.7. Add Hosts or Configure Clusters (vSphere)</h3></div></div></div><div class="para">
-			Use vCenter to create a vCenter cluster and add your desired hosts to the cluster. You will later add the entire cluster to CloudStack. (see <a class="xref" href="cluster-add.html#add-clusters-vsphere">Section 6.4.2, “Add Cluster: vSphere”</a>).
-		</div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="citrix-xenserver-installation.html"><strong>Prev</strong>8.2. Citrix XenServer Installation for CloudStack</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="choosing-a-deployment_architecture.html"><strong>Next</strong>Chapter 9. Choosing a Deployment Architecture</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vpn.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vpn.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vpn.html
deleted file mode 100644
index 2c6d742..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/vpn.html
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>15.17. VPN</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="networks.html" title="Chapter 15. Managing Networks and Traffic" /><link rel="prev" href="dns-dhcp.html" title="15.16. DNS and DHCP" /><link rel="next" href="inter-vlan-routing.html" title="15.18. About Inter-VLAN Routing" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="dns-dhcp.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="inter-vlan-routi
 ng.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="vpn" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="vpn">15.17. VPN</h2></div></div></div><div class="para">
-		CloudStack account owners can create virtual private networks (VPN) to access their virtual machines. If the guest network is instantiated from a network offering that offers the Remote Access VPN service, the virtual router (based on the System VM) is used to provide the service. CloudStack provides a L2TP-over-IPsec-based remote access VPN service to guest virtual networks. Since each network gets its own virtual router, VPNs are not shared across the networks. VPN clients native to Windows, Mac OS X and iOS can be used to connect to the guest networks. The account owner can create and manage users for their VPN. CloudStack does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.
-	</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-			Make sure that not all traffic goes through the VPN. That is, the route installed by the VPN should be only for the guest network and not for all traffic.
-		</div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				<span class="bold bold"><strong>Road Warrior / Remote Access</strong></span>. Users want to be able to connect securely from a home or office to a private network in the cloud. Typically, the IP address of the connecting client is dynamic and cannot be preconfigured on the VPN server.
-			</div></li><li class="listitem"><div class="para">
-				<span class="bold bold"><strong>Site to Site</strong></span>. In this scenario, two private subnets are connected over the public Internet with a secure VPN tunnel. The cloud user’s subnet (for example, an office network) is connected through a gateway to the network in the cloud. The address of the user’s gateway must be preconfigured on the VPN server in the cloud. Note that although L2TP-over-IPsec can be used to set up Site-to-Site VPNs, this is not the primary intent of this feature.
-			</div></li></ul></div><div xml:lang="en-US" class="section" id="configure-vpn" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="configure-vpn">15.17.1. Configuring VPN</h3></div></div></div><div class="para">
-		To set up VPN for the cloud:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Global Settings.
-			</div></li><li class="listitem"><div class="para">
-				Set the following global configuration parameters.
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.
-					</div></li><li class="listitem"><div class="para">
-						remote.access.vpn.psk.length – Length of the IPSec key.
-					</div></li><li class="listitem"><div class="para">
-						remote.access.vpn.user.limit – Maximum number of VPN users per account.
-					</div></li></ul></div></li></ol></div><div class="para">
-		To enable VPN for a particular network:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in as a user or administrator to the CloudStack UI.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Network.
-			</div></li><li class="listitem"><div class="para">
-				Click the name of the network you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click View IP Addresses.
-			</div></li><li class="listitem"><div class="para">
-				Click one of the displayed IP address names.
-			</div></li><li class="listitem"><div class="para">
-				Click the Enable VPN button 
-				<span class="inlinemediaobject"><img src="./images/vpn-icon.png" alt="AttachDiskButton.png: button to attach a volume" /></span>
-				.
-			</div><div class="para">
-				The IPsec key is displayed in a popup window.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="using-vpn-with-windows" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="using-vpn-with-windows">15.17.2. Using VPN with Windows</h3></div></div></div><div class="para">
-		The procedure to use VPN varies by Windows version. Generally, the user must edit the VPN properties and make sure that the default route is not the VPN. The following steps are for Windows L2TP clients on Windows Vista. The commands should be similar for other Windows versions.
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI and click on the source NAT IP for the account. The VPN tab should display the IPsec preshared key. Make a note of this and the source NAT IP. The UI also lists one or more users and their passwords. Choose one of these users, or, if none exists, add a user and password.
-			</div></li><li class="listitem"><div class="para">
-				On the Windows box, go to Control Panel, then select Network and Sharing center. Click Setup a connection or network.
-			</div></li><li class="listitem"><div class="para">
-				In the next dialog, select No, create a new connection.
-			</div></li><li class="listitem"><div class="para">
-				In the next dialog, select Use my Internet Connection (VPN).
-			</div></li><li class="listitem"><div class="para">
-				In the next dialog, enter the source NAT IP from step 1 and give the connection a name. Check Don't connect now.
-			</div></li><li class="listitem"><div class="para">
-				In the next dialog, enter the user name and password selected in step 1.
-			</div></li><li class="listitem"><div class="para">
-				Click Create.
-			</div></li><li class="listitem"><div class="para">
-				Go back to the Control Panel and click Network Connections to see the new connection. The connection is not active yet.
-			</div></li><li class="listitem"><div class="para">
-				Right-click the new connection and select Properties. In the Properties dialog, select the Networking tab.
-			</div></li><li class="listitem"><div class="para">
-				In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings. Select Use preshared key. Enter the preshared key from Step 1.
-			</div></li><li class="listitem"><div class="para">
-				The connection is ready for activation. Go back to Control Panel -&gt; Network Connections and double-click the created connection.
-			</div></li><li class="listitem"><div class="para">
-				Enter the user name and password from Step 1.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="using-vpn-with-mac" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="using-vpn-with-mac">15.17.3. Using VPN with Mac OS X</h3></div></div></div><div class="para">
-		In Mac OS X, in Network Preferences - Advanced, make sure Send all traffic over VPN connection is not checked.
-	</div></div><div xml:lang="en-US" class="section" id="site-to-site-vpn" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="site-to-site-vpn">15.17.4. Setting Up a Site-to-Site VPN Connection</h3></div></div></div><div class="para">
-		A Site-to-Site VPN connection helps you establish a secure connection from an enterprise datacenter to the cloud infrastructure. This allows users to access the guest VMs by establishing a VPN connection to the virtual router of the account from a device in the datacenter of the enterprise. Having this facility eliminates the need to establish VPN connections to individual VMs.
-	</div><div class="para">
-		The supported endpoints on the remote datacenters are:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				Cisco ISR with IOS 12.4 or later
-			</div></li><li class="listitem"><div class="para">
-				Juniper J-Series routers with JunOS 9.5 or later
-			</div></li></ul></div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-			In addition to the specific Cisco and Juniper devices listed above, the expectation is that any Cisco or Juniper device running on the supported operating systems are able to establish VPN connections.
-		</div></div></div><div class="para">
-		To set up a Site-to-Site VPN connection, perform the following:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Create a Virtual Private Cloud (VPC).
-			</div><div class="para">
-				See <a class="xref" href="configure-vpc.html">Section 15.19, “Configuring a Virtual Private Cloud”</a>.
-			</div></li><li class="listitem"><div class="para">
-				Create a VPN Customer Gateway.
-			</div></li><li class="listitem"><div class="para">
-				Create a VPN gateway for the VPC that you created.
-			</div></li><li class="listitem"><div class="para">
-				Create VPN connection from the VPC VPN gateway to the customer VPN gateway.
-			</div></li></ol></div><div xml:lang="en-US" class="section" id="create-vpn-customer-gateway" lang="en-US"><div class="titlepage"><div><div><h4 class="title" id="create-vpn-customer-gateway">15.17.4.1. Creating and Updating a VPN Customer Gateway</h4></div></div></div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-			A VPN customer gateway can be connected to only one VPN gateway at a time.
-		</div></div></div><div class="para">
-		To add a VPN Customer Gateway:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				In the Select view, select VPN Customer Gateway.
-			</div></li><li class="listitem"><div class="para">
-				Click Add site-to-site VPN.
-			</div><div class="mediaobject"><img src="./images/add-vpn-customer-gateway.png" alt="addvpncustomergateway.png: adding a customer gateway." /></div><div class="para">
-				Provide the following information:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Name</strong></span>: A unique name for the VPN customer gateway you create.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Gateway</strong></span>: The IP address for the remote gateway.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>CIDR list</strong></span>: The guest CIDR list of the remote subnets. Enter a CIDR or a comma-separated list of CIDRs. Ensure that a guest CIDR list is not overlapped with the VPC’s CIDR, or another guest CIDR. The CIDR must be RFC1918-compliant.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>IPsec Preshared Key</strong></span>: Preshared keying is a method where the endpoints of the VPN share a secret key. This key value is used to authenticate the customer gateway and the VPC VPN gateway to each other.
-					</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-							The IKE peers (VPN end points) authenticate each other by computing and sending a keyed hash of data that includes the Preshared key. If the receiving peer is able to create the same hash independently by using its Preshared key, it knows that both peers must share the same secret, thus authenticating the customer gateway.
-						</div></div></div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>IKE Encryption</strong></span>: The Internet Key Exchange (IKE) policy for phase-1. The supported encryption algorithms are AES128, AES192, AES256, and 3DES. Authentication is accomplished through the Preshared Keys.
-					</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-							The phase-1 is the first phase in the IKE process. In this initial negotiation phase, the two VPN endpoints agree on the methods to be used to provide security for the underlying IP traffic. The phase-1 authenticates the two VPN gateways to each other, by confirming that the remote gateway has a matching Preshared Key.
-						</div></div></div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>IKE Hash</strong></span>: The IKE hash for phase-1. The supported hash algorithms are SHA1 and MD5.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>IKE DH</strong></span>: A public-key cryptography protocol which allows two parties to establish a shared secret over an insecure communications channel. The 1536-bit Diffie-Hellman group is used within IKE to establish session keys. The supported options are None, Group-5 (1536-bit) and Group-2 (1024-bit).
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>ESP Encryption</strong></span>: Encapsulating Security Payload (ESP) algorithm within phase-2. The supported encryption algorithms are AES128, AES192, AES256, and 3DES.
-					</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-							The phase-2 is the second phase in the IKE process. The purpose of IKE phase-2 is to negotiate IPSec security associations (SA) to set up the IPSec tunnel. In phase-2, new keying material is extracted from the Diffie-Hellman key exchange in phase-1, to provide session keys to use in protecting the VPN data flow.
-						</div></div></div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>ESP Hash</strong></span>: Encapsulating Security Payload (ESP) hash for phase-2. Supported hash algorithms are SHA1 and MD5.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Perfect Forward Secrecy</strong></span>: Perfect Forward Secrecy (or PFS) is the property that ensures that a session key derived from a set of long-term public and private keys will not be compromised. This property enforces a new Diffie-Hellman key exchange. It provides the keying material that has greater key material life and thereby greater resistance to cryptographic attacks. The available options are None, Group-5 (1536-bit) and Group-2 (1024-bit). The security of the key exchanges increase as the DH groups grow larger, as does the time of the exchanges.
-					</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-							When PFS is turned on, for every negotiation of a new phase-2 SA the two gateways must generate a new set of phase-1 keys. This adds an extra layer of protection that PFS adds, which ensures if the phase-2 SA’s have expired, the keys used for new phase-2 SA’s have not been generated from the current phase-1 keying material.
-						</div></div></div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>IKE Lifetime (seconds)</strong></span>: The phase-1 lifetime of the security association in seconds. Default is 86400 seconds (1 day). Whenever the time expires, a new phase-1 exchange is performed.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>ESP Lifetime (seconds)</strong></span>: The phase-2 lifetime of the security association in seconds. Default is 3600 seconds (1 hour). Whenever the value is exceeded, a re-key is initiated to provide a new IPsec encryption and authentication session keys.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Dead Peer Detection</strong></span>: A method to detect an unavailable Internet Key Exchange (IKE) peer. Select this option if you want the virtual router to query the liveliness of its IKE peer at regular intervals. It’s recommended to have the same configuration of DPD on both side of VPN connection.
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Click OK.
-			</div></li></ol></div><div class="formalpara"><h5 class="formalpara" id="idp18189840">Updating and Removing a VPN Customer Gateway</h5>
-			You can update a customer gateway either with no VPN connection, or related VPN connection is in error state.
-		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				In the Select view, select VPN Customer Gateway.
-			</div></li><li class="listitem"><div class="para">
-				Select the VPN customer gateway you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				To modify the required parameters, click the Edit VPN Customer Gateway button
-				<span class="inlinemediaobject"><img src="./images/edit-icon.png" alt="edit.png: button to edit a VPN customer gateway" /></span>
-			</div></li><li class="listitem"><div class="para">
-				To remove the VPN customer gateway, click the Delete VPN Customer Gateway button
-				<span class="inlinemediaobject"><img src="./images/delete-button.png" alt="delete.png: button to remove a VPN customer gateway" /></span>
-			</div></li><li class="listitem"><div class="para">
-				Click OK.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="create-vpn-gateway-for-vpc" lang="en-US"><div class="titlepage"><div><div><h4 class="title" id="create-vpn-gateway-for-vpc">15.17.4.2. Creating a VPN gateway for the VPC</h4></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				In the Select view, select VPC.
-			</div><div class="para">
-				All the VPCs that you have created for the account is listed in the page.
-			</div></li><li class="listitem"><div class="para">
-				Click the Configure button of the VPC to which you want to deploy the VMs.
-			</div><div class="para">
-				The VPC page is displayed where all the tiers you created are listed in a diagram.
-			</div></li><li class="listitem"><div class="para">
-				Click the Settings icon.
-			</div><div class="para">
-				The following options are displayed.
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						IP Addresses
-					</div></li><li class="listitem"><div class="para">
-						Gateways
-					</div></li><li class="listitem"><div class="para">
-						Site-to-Site VPN
-					</div></li><li class="listitem"><div class="para">
-						Network ACLs
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Select Site-to-Site VPN.
-			</div><div class="para">
-				If you are creating the VPN gateway for the first time, selecting Site-to-Site VPN prompts you to create a VPN gateway.
-			</div></li><li class="listitem"><div class="para">
-				In the confirmation dialog, click Yes to confirm.
-			</div><div class="para">
-				Within a few moments, the VPN gateway is created. You will be prompted to view the details of the VPN gateway you have created. Click Yes to confirm.
-			</div><div class="para">
-				The following details are displayed in the VPN Gateway page:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						IP Address
-					</div></li><li class="listitem"><div class="para">
-						Account
-					</div></li><li class="listitem"><div class="para">
-						Domain
-					</div></li></ul></div></li></ol></div></div><div xml:lang="en-US" class="section" id="create-vpn-connection-vpc" lang="en-US"><div class="titlepage"><div><div><h4 class="title" id="create-vpn-connection-vpc">15.17.4.3. Creating a VPN Connection</h4></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				In the Select view, select VPC.
-			</div><div class="para">
-				All the VPCs that you create for the account are listed in the page.
-			</div></li><li class="listitem"><div class="para">
-				Click the Configure button of the VPC to which you want to deploy the VMs.
-			</div><div class="para">
-				The VPC page is displayed where all the tiers you created are listed in a diagram.
-			</div></li><li class="listitem"><div class="para">
-				Click the Settings icon.
-			</div><div class="para">
-				The following options are displayed.
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						IP Addresses
-					</div></li><li class="listitem"><div class="para">
-						Gateways
-					</div></li><li class="listitem"><div class="para">
-						Site-to-Site VPN
-					</div></li><li class="listitem"><div class="para">
-						Network ASLs
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Select Site-to-Site VPN.
-			</div><div class="para">
-				The Site-to-Site VPN page is displayed.
-			</div></li><li class="listitem"><div class="para">
-				From the Select View drop-down, ensure that VPN Connection is selected.
-			</div></li><li class="listitem"><div class="para">
-				Click Create VPN Connection.
-			</div><div class="para">
-				The Create VPN Connection dialog is displayed:
-			</div><div class="mediaobject"><img src="./images/create-vpn-connection.png" alt="createvpnconnection.png: creating a vpn connection to the customer gateway." /></div></li><li class="listitem"><div class="para">
-				Select the desired customer gateway, then click OK to confirm.
-			</div><div class="para">
-				Within a few moments, the VPN Connection is displayed.
-			</div><div class="para">
-				The following information on the VPN connection is displayed:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						IP Address
-					</div></li><li class="listitem"><div class="para">
-						Gateway
-					</div></li><li class="listitem"><div class="para">
-						State
-					</div></li><li class="listitem"><div class="para">
-						IPSec Preshared Key
-					</div></li><li class="listitem"><div class="para">
-						IKE Policy
-					</div></li><li class="listitem"><div class="para">
-						ESP Policy
-					</div></li></ul></div></li></ol></div></div><div xml:lang="en-US" class="section" id="delete-reset-vpn" lang="en-US"><div class="titlepage"><div><div><h4 class="title" id="delete-reset-vpn">15.17.4.4. Restarting and Removing a VPN Connection</h4></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, choose Network.
-			</div></li><li class="listitem"><div class="para">
-				In the Select view, select VPC.
-			</div><div class="para">
-				All the VPCs that you have created for the account is listed in the page.
-			</div></li><li class="listitem"><div class="para">
-				Click the Configure button of the VPC to which you want to deploy the VMs.
-			</div><div class="para">
-				The VPC page is displayed where all the tiers you created are listed in a diagram.
-			</div></li><li class="listitem"><div class="para">
-				Click the Settings icon.
-			</div><div class="para">
-				The following options are displayed.
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						IP Addresses
-					</div></li><li class="listitem"><div class="para">
-						Gateways
-					</div></li><li class="listitem"><div class="para">
-						Site-to-Site VPN
-					</div></li><li class="listitem"><div class="para">
-						Network ASLs
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Select Site-to-Site VPN.
-			</div><div class="para">
-				The Site-to-Site VPN page is displayed.
-			</div></li><li class="listitem"><div class="para">
-				From the Select View drop-down, ensure that VPN Connection is selected.
-			</div><div class="para">
-				All the VPN connections you created are displayed.
-			</div></li><li class="listitem"><div class="para">
-				Select the VPN connection you want to work with.
-			</div><div class="para">
-				The Details tab is displayed.
-			</div></li><li class="listitem"><div class="para">
-				To remove a VPN connection, click the Delete VPN connection button
-				<span class="inlinemediaobject"><img src="./images/remove-vpn.png" alt="remove-vpn.png: button to remove a VPN connection" /></span>
-			</div><div class="para">
-				To restart a VPN connection, click the Reset VPN connection button present in the Details tab.
-				<span class="inlinemediaobject"><img src="./images/reset-vpn.png" alt="reset-vpn.png: button to reset a VPN connection" /></span>
-			</div></li></ol></div></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="dns-dhcp.html"><strong>Prev</strong>15.16. DNS and DHCP</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="inter-vlan-routing.html"><strong>Next</strong>15.18. About Inter-VLAN Routing</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35666a52/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/whatis.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/whatis.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/whatis.html
deleted file mode 100644
index 04215bd..0000000
--- a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/whatis.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>1.1. What Is CloudStack?</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><script type="text/javascript" src="../../../../../toc.js"></script><script type="text/javascript">
-              addID('Apache_CloudStack');
-              
-	      addID('Apache_CloudStack.4.0.0-incubating');
-              
-              addID('Apache_CloudStack.4.0.0-incubating.books');
-	      addID('Apache_CloudStack.4.0.0-incubating.Admin_Guide');
-              </script><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="concepts.html" title="Chapter 1. Concepts" /><link rel="prev" href="concepts.html" title="Chapter 1. Concepts" /><link rel="next" href="feature-overview.html" title="1.2. What Can CloudStack Do?" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="../../../../toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="concepts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="feature-overview.html"><strong>Next</stron
 g></a></li></ul><div xml:lang="en-US" class="section" id="whatis" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="whatis">1.1. What Is CloudStack?</h2></div></div></div><div class="para">
-		CloudStack is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack to deploy, manage, and configure cloud computing environments.
-	</div><div class="para">
-		Typical users are service providers and enterprises. With CloudStack, you can:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.
-			</div></li><li class="listitem"><div class="para">
-				Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with CloudStack an enterprise can offer self-service virtual machines to users without involving IT departments.
-			</div></li></ul></div><div class="mediaobject"><img src="./images/1000-foot-view.png" width="444" alt="1000-foot-view.png: Overview of CloudStack" /></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="concepts.html"><strong>Prev</strong>Chapter 1. Concepts</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="feature-overview.html"><strong>Next</strong>1.2. What Can CloudStack Do?</a></li></ul></body></html>


Mime
View raw message