You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jz...@apache.org on 2012/11/07 19:01:11 UTC

[13/52] [abbrv] [partial] CLOUDSTACK-444 Fix from Radhika PC against docs, adds network setup in the install guide.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-reference.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-reference.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-reference.html
new file mode 100644
index 0000000..156366e
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/api-reference.html
@@ -0,0 +1,11 @@
+<?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>2.2. API Reference Documentation</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="developer-introduction.html" title="Chapter 2. Introduction for Developers" /><link rel="prev" href="roles.html" title="2.1. Roles" /><link rel="next" href="getting-started.html" title="2.3. Getting Started" /></head><body><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 s
 rc="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="roles.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="getting-started.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="api-reference" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="api-reference">2.2. API Reference Documentation</h2></div></div></div><div class="para">
+		2.2 API Reference:
+	</div><div class="para">
+		<a href="http://download.cloud.com/support/downloads.html/">http://download.cloud.com/support/downloads.html/</a>
+	</div><div class="para">
+		3.0 API Reference:
+	</div><div class="para">
+		<a href="http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/">http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/</a>
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="roles.html"><strong>Prev</strong>2.1. Roles</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="getting-started.html"><strong>Next</strong>2.3. Getting Started</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/appe-cloudstack-Revision_History.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/appe-cloudstack-Revision_History.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/appe-cloudstack-Revision_History.html
new file mode 100644
index 0000000..b41f0c4
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/appe-cloudstack-Revision_History.html
@@ -0,0 +1,16 @@
+<?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>Appendix D. Revision History</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="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="alerts.html" title="Appendix C. Alerts" /></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="alerts.html"><strong>Prev</strong></a></li><li class="next"></li></ul><div xml:lang="en-US" class="appendix" id="appe-cloudstack-Revision_History" lang="en-US"><div class="titlepage"><div><div><h1 class="titl
 e">Revision History</h1></div></div></div><div class="para">
+		<div class="revhistory"><table border="0" width="100%" summary="Revision history"><tr><th align="left" valign="top" colspan="3"><strong>Revision History</strong></th></tr><tr><td align="left">Revision 0-0</td><td align="left">Tue May 29 2012</td><td align="left"><span class="author"><span class="firstname">Jessica</span> <span class="surname">Tomechak</span></span></td></tr><tr><td align="left" colspan="3">
+					<table border="0" summary="Simple list" class="simplelist"><tr><td>Initial creation of book by publican</td></tr></table>
+
+				</td></tr></table></div>
+
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="alerts.html"><strong>Prev</strong>Appendix C. Alerts</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></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/asynchronous-commands.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/asynchronous-commands.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/asynchronous-commands.html
new file mode 100644
index 0000000..f48e324
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/asynchronous-commands.html
@@ -0,0 +1,106 @@
+<?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>4.5. Asynchronous Commands</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="api-calls.html" title="Chapter 4. Calling the CloudStack API" /><link rel="prev" href="responses.html" title="4.4. Responses" /><link rel="next" href="working-with-usage-data.html" title="Chapter 5. Working With Usage Data" /></head><body><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="responses.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="working-with-usage-data.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="asynchronous-commands" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="asynchronous-commands">4.5. Asynchronous Commands</h2></div></div></div><div class="para">
+		Asynchronous commands were introduced in CloudStack 2.x. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume. They differ from synchronous commands by the following:
+	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+				They are identified in the API Reference by an (A).
+			</div></li><li class="listitem"><div class="para">
+				They will immediately return a job ID to refer to the job that will be responsible in processing the command.
+			</div></li><li class="listitem"><div class="para">
+				If executed as a "create" resource command, it will return the resource ID as well as the job ID.
+			</div><div class="para">
+				You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.
+			</div></li></ul></div><div xml:lang="en-US" class="section" id="job-status" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="job-status">4.5.1. Job Status</h3></div></div></div><div class="para">
+		The key to using an asynchronous command is the job ID that is returned immediately once the command has been executed. With the job ID, you can periodically check the job status by making calls to queryAsyncJobResult command. The command will return three possible job status integer values:
+	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+				0 - Job is still in progress. Continue to periodically poll for any status changes.
+			</div></li><li class="listitem"><div class="para">
+				1 - Job has successfully completed. The job will return any successful response values associated with command that was originally executed.
+			</div></li><li class="listitem"><div class="para">
+				2 - Job has failed to complete. Please check the "jobresultcode" tag for failure reason code and "jobresult" for the failure reason.
+			</div></li></ul></div></div><div xml:lang="en-US" class="section" id="asynchronous-commands-example" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="asynchronous-commands-example">4.5.2. Example</h3></div></div></div><div class="para">
+		The following shows an example of using an asynchronous command. Assume the API command:
+	</div><pre class="programlisting">command=deployVirtualMachine&amp;zoneId=1&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=1
+</pre><div class="para">
+		CloudStack will immediately return a job ID and any other additional data.
+	</div><pre class="programlisting">
+         &lt;deployvirtualmachineresponse&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+             &lt;id&gt;100&lt;/id&gt;
+         &lt;/deployvirtualmachineresponse&gt;
+</pre><div class="para">
+		Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.
+	</div><pre class="programlisting">command=queryAsyncJobResult&amp;jobId=1</pre><div class="para">
+		Three possible results could come from this query.
+	</div><div class="para">
+		Job is still pending:
+	</div><pre class="programlisting">
+         &lt;queryasyncjobresult&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+              &lt;jobstatus&gt;0&lt;/jobstatus&gt;
+              &lt;jobprocstatus&gt;1&lt;/jobprocstatus&gt;
+         &lt;/queryasyncjobresult&gt;
+</pre><div class="para">
+		Job has succeeded:
+	</div><pre class="programlisting">
+            &lt;queryasyncjobresultresponse cloud-stack-version="3.0.1.6"&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt;
+                  &lt;jobstatus&gt;1&lt;/jobstatus&gt;
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                 &lt;jobresultcode&gt;0&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;object&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;
+                    &lt;virtualmachine&gt;
+                    &lt;id&gt;450&lt;/id&gt;
+                    &lt;name&gt;i-2-450-VM&lt;/name&gt;
+                    &lt;displayname&gt;i-2-450-VM&lt;/displayname&gt;
+                    &lt;account&gt;admin&lt;/account&gt;
+                    &lt;domainid&gt;1&lt;/domainid&gt;
+                    &lt;domain&gt;ROOT&lt;/domain&gt;
+                    &lt;created&gt;2011-03-10T18:20:25-0800&lt;/created&gt;
+                    &lt;state&gt;Running&lt;/state&gt;
+                    &lt;haenable&gt;false&lt;/haenable&gt;
+                    &lt;zoneid&gt;1&lt;/zoneid&gt;
+                    &lt;zonename&gt;San Jose 1&lt;/zonename&gt;
+                    &lt;hostid&gt;2&lt;/hostid&gt;
+                    &lt;hostname&gt;905-13.sjc.lab.vmops.com&lt;/hostname&gt;
+                    &lt;templateid&gt;1&lt;/templateid&gt;
+                    &lt;templatename&gt;CentOS 5.3 64bit LAMP&lt;/templatename&gt;
+                    &lt;templatedisplaytext&gt;CentOS 5.3 64bit LAMP&lt;/templatedisplaytext&gt;
+                    &lt;passwordenabled&gt;false&lt;/passwordenabled&gt;
+                    &lt;serviceofferingid&gt;1&lt;/serviceofferingid&gt;
+                    &lt;serviceofferingname&gt;Small Instance&lt;/serviceofferingname&gt;
+                    &lt;cpunumber&gt;1&lt;/cpunumber&gt;
+                    &lt;cpuspeed&gt;500&lt;/cpuspeed&gt;
+                    &lt;memory&gt;512&lt;/memory&gt;
+                    &lt;guestosid&gt;12&lt;/guestosid&gt;
+                    &lt;rootdeviceid&gt;0&lt;/rootdeviceid&gt;
+                    &lt;rootdevicetype&gt;NetworkFilesystem&lt;/rootdevicetype&gt;
+                    &lt;nic&gt;
+                      &lt;id&gt;561&lt;/id&gt;
+                      &lt;networkid&gt;205&lt;/networkid&gt;
+                      &lt;netmask&gt;255.255.255.0&lt;/netmask&gt;
+                      &lt;gateway&gt;10.1.1.1&lt;/gateway&gt;
+                      &lt;ipaddress&gt;10.1.1.225&lt;/ipaddress&gt;
+                      &lt;isolationuri&gt;vlan://295&lt;/isolationuri&gt;
+                      &lt;broadcasturi&gt;vlan://295&lt;/broadcasturi&gt;
+                      &lt;traffictype&gt;Guest&lt;/traffictype&gt;
+                      &lt;type&gt;Virtual&lt;/type&gt;
+                      &lt;isdefault&gt;true&lt;/isdefault&gt;
+                    &lt;/nic&gt;
+                    &lt;hypervisor&gt;XenServer&lt;/hypervisor&gt;
+                   &lt;/virtualmachine&gt;
+                 &lt;/jobresult&gt;
+            &lt;/queryasyncjobresultresponse&gt;
+</pre><div class="para">
+		Job has failed:
+	</div><pre class="programlisting">
+            &lt;queryasyncjobresult&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt; 
+                  &lt;jobstatus&gt;2&lt;/jobstatus&gt; 
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                  &lt;jobresultcode&gt;551&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;text&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;Unable to deploy virtual machine id = 100 due to not enough capacity&lt;/jobresult&gt; 
+            &lt;/queryasyncjobresult&gt;
+</pre></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="responses.html"><strong>Prev</strong>4.4. Responses</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-usage-data.html"><strong>Next</strong>Chapter 5. Working With Usage Data</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-configuration.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-configuration.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-configuration.html
new file mode 100644
index 0000000..de13638
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-configuration.html
@@ -0,0 +1,25 @@
+<?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. Enabling the AWS API Compatible Interface</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-requirements.html" title="10.2. System Requirements" /><link rel="next" href="aws-ec2-user-setup.html" title="10.4. AWS API User Setup Steps" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Pro
 duct 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="aws-ec2-requirements.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-user-setup.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-configuration" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-configuration">10.3. Enabling the AWS API Compatible Interface</h2></div></div></div><div class="para">
+		The software that provides AWS API compatibility is installed along with CloudPlatform. However, you must enable the feature and perform some setup steps.
+	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
+				Set the global configuration parameter enable.ec2.api to true. See <a class="xref" href="global-config.html">Chapter 7, <em>Setting Global Configuration Parameters</em></a>.
+			</div></li><li class="listitem"><div class="para">
+				Create a set of CloudStack service offerings with names that match the Amazon service offerings. You can do this through the CloudStack UI as described in the Administration Guide.
+			</div><div class="warning"><div class="admonition_header"><h2>Warning</h2></div><div class="admonition"><div class="para">
+					Be sure you have included the Amazon default service offering, m1.small.
+				</div></div></div></li><li class="listitem"><div class="para">
+				If you did not already do so when you set the configuration parameter in step 1, restart the Management Server.
+			</div><pre class="programlisting"># service cloud-management restart</pre></li><li class="listitem"><div class="para">
+				(Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows:
+			</div><div class="orderedlist"><ol class="loweralpha"><li class="listitem"><div class="para">
+						Edit the files /etc/cloud/management/server.xml, /etc/cloud/management/server-nonssl.xml, and /etc/cloud/management/server-ssl.xml.
+					</div></li><li class="listitem"><div class="para">
+						In each file, find the tag &lt;Service name="Catalina7080"&gt;. Under this tag, locate &lt;Connector executor="tomcatThreadPool-internal" port= ....&lt;.
+					</div></li><li class="listitem"><div class="para">
+						Change the port to whatever port you want to use, then save the files.
+					</div></li><li class="listitem"><div class="para">
+						Restart the Management Server.
+					</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
+							If you re-install CloudStack, you will have to make these changes again.
+						</div></div></div></li></ol></div></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-requirements.html"><strong>Prev</strong>10.2. System Requirements</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="aws-ec2-user-setup.html"><strong>Next</strong>10.4. AWS API User Setup Steps</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-introduction.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-introduction.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-introduction.html
new file mode 100644
index 0000000..e4f0077
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-introduction.html
@@ -0,0 +1,15 @@
+<?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.1. Amazon Web Services EC2 Compatible Interface</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="next" href="aws-ec2-requirements.html" title="10.2. System Requirements" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Co
 ntent/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="aws-interface-compatibility.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-requirements.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-introduction" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-introduction">10.1. Amazon Web Services EC2 Compatible Interface</h2></div></div></div><div class="para">
+		CloudStack can translate Amazon Web Services (AWS) API calls to native CloudStack API calls so that users can continue using existing AWS-compatible tools. This translation service runs as a separate web application in the same tomcat server as the management server of CloudStack, listening on the same port. This Amazon EC2-compatible API is accessible through a SOAP web service.
+	</div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
+			This service was previously enabled by separate software called CloudBridge. It is now fully integrated with the CloudStack management server.
+		</div></div></div><div class="para">
+		Limitations
+	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+				Supported only in zones that use basic networking.
+			</div></li><li class="listitem"><div class="para">
+				Available in fresh installations of CloudStack. Not available through upgrade of previous versions.
+			</div></li><li class="listitem"><div class="para">
+				If you need to support features such as elastic IP, set up a Citrix NetScaler to provide this service. The commands such as ec2-associate-address will not work without EIP setup. Users running VMs in this zone will be using the NetScaler-enabled network offering (DefaultSharedNetscalerEIP and ELBNetworkOffering).
+			</div></li></ul></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-interface-compatibility.html"><strong>Prev</strong>Chapter 10. Amazon Web Service Interface Compatib...</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="aws-ec2-requirements.html"><strong>Next</strong>10.2. System Requirements</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-requirements.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-requirements.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-requirements.html
new file mode 100644
index 0000000..ca544a4
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-requirements.html
@@ -0,0 +1,7 @@
+<?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.2. System Requirements</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-introduction.html" title="10.1. Amazon Web Services EC2 Compatible Interface" /><link rel="next" href="aws-ec2-configuration.html" title="10.3. Enabling the AWS API Compatible Interface" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/i
 mage_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="aws-ec2-introduction.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-configuration.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-requirements" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-requirements">10.2. System Requirements</h2></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+				This interface complies with Amazon's WDSL version dated November 15, 2010, available at <a href="http://ec2.amazonaws.com/doc/2010-11-15/">http://ec2.amazonaws.com/doc/2010-11-15/</a>.
+			</div></li><li class="listitem"><div class="para">
+				Compatible with the EC2 command-line tools <span class="emphasis"><em>EC2 tools v. 1.3.6230</em></span>, which can be downloaded at <a href="http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip">http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip</a>.
+			</div></li></ul></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-introduction.html"><strong>Prev</strong>10.1. Amazon Web Services EC2 Compatible Interface</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="aws-ec2-configuration.html"><strong>Next</strong>10.3. Enabling the AWS API Compatible Interface</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-supported-commands.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-supported-commands.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-supported-commands.html
new file mode 100644
index 0000000..845cb40
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-supported-commands.html
@@ -0,0 +1,299 @@
+<?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.6. Supported AWS API Calls</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-timeouts.html" title="10.5. Using Timeouts to Ensure AWS API Command Completion" /><link rel="next" href="networks.html" title="Chapter 11. Managing Networks and Traffic" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.p
 ng" 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="aws-ec2-timeouts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="networks.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-supported-commands" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-supported-commands">10.6. Supported AWS API Calls</h2></div></div></div><div class="para">
+		The following Amazon EC2 commands are supported by CloudStack when the AWS API compatibility feature is enabled. For a few commands, there are differences between the CloudStack and Amazon EC2 versions, and these differences are noted. The underlying SOAP call for each command is also given, for those who have built tools using those calls.
+	</div><div class="table"><h6>Table 10.1. Elastic IP API mapping</h6><div class="table-contents"><table summary="Elastic IP API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-allocate-address
+					</td><td align="left">
+						AllocateAddress
+					</td><td align="left">
+						associateIpAddress
+					</td></tr><tr><td align="left">
+						ec2-associate-address
+					</td><td align="left">
+						AssociateAddress
+					</td><td align="left">
+						enableStaticNat
+					</td></tr><tr><td align="left">
+						ec2-describe-addresses
+					</td><td align="left">
+						DescribeAddresses
+					</td><td align="left">
+						listPublicIpAddresses
+					</td></tr><tr><td align="left">
+						ec2-diassociate-address
+					</td><td align="left">
+						DisassociateAddress
+					</td><td align="left">
+						disableStaticNat
+					</td></tr><tr><td align="left">
+						ec2-release-address
+					</td><td align="left">
+						ReleaseAddress
+					</td><td align="left">
+						disassociateIpAddress
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.2. Availability Zone API mapping</h6><div class="table-contents"><table summary="Availability Zone API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-describe-availability-zones
+					</td><td align="left">
+						DescribeAvailabilityZones
+					</td><td align="left">
+						listZones
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.3. Images API mapping</h6><div class="table-contents"><table summary="Images API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-create-image
+					</td><td align="left">
+						CreateImage
+					</td><td align="left">
+						createTemplate
+					</td></tr><tr><td align="left">
+						ec2-deregister
+					</td><td align="left">
+						DeregisterImage
+					</td><td align="left">
+						DeleteTemplate
+					</td></tr><tr><td align="left">
+						ec2-describe-images
+					</td><td align="left">
+						DescribeImages
+					</td><td align="left">
+						listTemplates
+					</td></tr><tr><td align="left">
+						ec2-register
+					</td><td align="left">
+						RegisterImage
+					</td><td align="left">
+						registerTemplate
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.4. Image Attributes API mapping</h6><div class="table-contents"><table summary="Image Attributes API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-describe-image-attribute
+					</td><td align="left">
+						DescribeImageAttribute
+					</td><td align="left">
+						listTemplatePermissions
+					</td></tr><tr><td align="left">
+						ec2-modify-image-attribute
+					</td><td align="left">
+						ModifyImageAttribute
+					</td><td align="left">
+						updateTemplatePermissions
+					</td></tr><tr><td align="left">
+						ec2-reset-image-attribute
+					</td><td align="left">
+						ResetImageAttribute
+					</td><td align="left">
+						updateTemplatePermissions
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.5. Instances API mapping</h6><div class="table-contents"><table summary="Instances API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-describe-instances
+					</td><td align="left">
+						DescribeInstances
+					</td><td align="left">
+						listVirtualMachines
+					</td></tr><tr><td align="left">
+						ec2-run-instances
+					</td><td align="left">
+						RunInstances
+					</td><td align="left">
+						deployVirtualMachine
+					</td></tr><tr><td align="left">
+						ec2-reboot-instances
+					</td><td align="left">
+						RebootInstances
+					</td><td align="left">
+						rebootVirtualMachine
+					</td></tr><tr><td align="left">
+						ec2-start-instances
+					</td><td align="left">
+						StartInstances
+					</td><td align="left">
+						startVirtualMachine
+					</td></tr><tr><td align="left">
+						ec2-stop-instances
+					</td><td align="left">
+						StopInstances
+					</td><td align="left">
+						stopVirtualMachine
+					</td></tr><tr><td align="left">
+						ec2-terminate-instances
+					</td><td align="left">
+						TerminateInstances
+					</td><td align="left">
+						destroyVirtualMachine
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.6. Instance Attributes Mapping</h6><div class="table-contents"><table summary="Instance Attributes Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-describe-instance-attribute
+					</td><td align="left">
+						DescribeInstanceAttribute
+					</td><td align="left">
+						listVirtualMachines
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.7. Keys Pairs Mapping</h6><div class="table-contents"><table summary="Keys Pairs Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-add-keypair
+					</td><td align="left">
+						CreateKeyPair
+					</td><td align="left">
+						createSSHKeyPair
+					</td></tr><tr><td align="left">
+						ec2-delete-keypair
+					</td><td align="left">
+						DeleteKeyPair
+					</td><td align="left">
+						deleteSSHKeyPair
+					</td></tr><tr><td align="left">
+						ec2-describe-keypairs
+					</td><td align="left">
+						DescribeKeyPairs
+					</td><td align="left">
+						listSSHKeyPairs
+					</td></tr><tr><td align="left">
+						ec2-import-keypair
+					</td><td align="left">
+						ImportKeyPair
+					</td><td align="left">
+						registerSSHKeyPair
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.8. Passwords API Mapping</h6><div class="table-contents"><table summary="Passwords API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-get-password
+					</td><td align="left">
+						GetPasswordData
+					</td><td align="left">
+						getVMPassword
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.9. Security Groups API Mapping</h6><div class="table-contents"><table summary="Security Groups API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-authorize
+					</td><td align="left">
+						AuthorizeSecurityGroupIngress
+					</td><td align="left">
+						authorizeSecurityGroupIngress
+					</td></tr><tr><td align="left">
+						ec2-add-group
+					</td><td align="left">
+						CreateSecurityGroup
+					</td><td align="left">
+						createSecurityGroup
+					</td></tr><tr><td align="left">
+						ec2-delete-group
+					</td><td align="left">
+						DeleteSecurityGroup
+					</td><td align="left">
+						deleteSecurityGroup
+					</td></tr><tr><td align="left">
+						ec2-describe-group
+					</td><td align="left">
+						DescribeSecurityGroups
+					</td><td align="left">
+						listSecurityGroups
+					</td></tr><tr><td align="left">
+						ec2-revoke
+					</td><td align="left">
+						RevokeSecurityGroupIngress
+					</td><td align="left">
+						revokeSecurityGroupIngress
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.10. Snapshots API Mapping</h6><div class="table-contents"><table summary="Snapshots API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-create-snapshot
+					</td><td align="left">
+						CreateSnapshot
+					</td><td align="left">
+						createSnapshot
+					</td></tr><tr><td align="left">
+						ec2-delete-snapshot
+					</td><td align="left">
+						DeleteSnapshot
+					</td><td align="left">
+						deleteSnapshot
+					</td></tr><tr><td align="left">
+						ec2-describe-snapshots
+					</td><td align="left">
+						DescribeSnapshots
+					</td><td align="left">
+						listSnapshots
+					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.11. Volumes API Mapping</h6><div class="table-contents"><table summary="Volumes API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
+						EC2 command
+					</th><th align="left">
+						SOAP call
+					</th><th align="left">
+						CloudStack API call
+					</th></tr></thead><tbody><tr><td align="left">
+						ec2-attach-volume
+					</td><td align="left">
+						AttachVolume
+					</td><td align="left">
+						attachVolume
+					</td></tr><tr><td align="left">
+						ec2-create-volume
+					</td><td align="left">
+						CreateVolume
+					</td><td align="left">
+						createVolume
+					</td></tr><tr><td align="left">
+						ec2-delete-volume
+					</td><td align="left">
+						DeleteVolume
+					</td><td align="left">
+						deleteVolume
+					</td></tr><tr><td align="left">
+						ec2-describe-volume
+					</td><td align="left">
+						DescribeVolume
+					</td><td align="left">
+						listVolumes
+					</td></tr><tr><td align="left">
+						ec2-detach-volume
+					</td><td align="left">
+						DetachVolume
+					</td><td align="left">
+						detachVolume
+					</td></tr></tbody></table></div></div><br class="table-break" /></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-timeouts.html"><strong>Prev</strong>10.5. Using Timeouts to Ensure AWS API Command Co...</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="networks.html"><strong>Next</strong>Chapter 11. Managing Networks and Traffic</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-timeouts.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-timeouts.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-timeouts.html
new file mode 100644
index 0000000..7527498
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-timeouts.html
@@ -0,0 +1,21 @@
+<?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.5. Using Timeouts to Ensure AWS API Command Completion</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-user-setup.html" title="10.4. AWS API User Setup Steps" /><link rel="next" href="aws-ec2-supported-commands.html" title="10.6. Supported AWS API Calls" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/imag
 e_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="aws-ec2-user-setup.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-supported-commands.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-timeouts" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-timeouts">10.5. Using Timeouts to Ensure AWS API Command Completion</h2></div></div></div><div class="para">
+		The Amazon EC2 command-line tools have a default connection timeout. When used with CloudStack, a longer timeout might be needed for some commands. If you find that commands are not completing due to timeouts, you can gain more time for commands to finish by overriding the default timeouts on individual commands. You can add the following optional command-line parameters to any CloudStack-supported EC2 command:
+	</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="50%" /><col align="left" class="c2" width="50%" /></colgroup><tbody><tr><td align="left">
+						
+<pre class="programlisting">--connection-timeout <em class="replaceable"><code>TIMEOUT</code></em></pre>
+					</td><td align="left">
+						Specifies a connection timeout (in seconds). Example: 
+<pre class="programlisting">--connection-timeout 30</pre>
+
+					</td></tr><tr><td align="left">
+						
+<pre class="programlisting">--request-timeout <em class="replaceable"><code>TIMEOUT</code></em></pre>
+					</td><td align="left">
+						Specifies a request timeout (in seconds). Example: 
+<pre class="programlisting">--request-timeout 45</pre>
+
+					</td></tr></tbody></table></div><div class="para">
+		Example:
+	</div><pre class="programlisting">ec2-run-instances 2 –z us-test1 –n 1-3 --connection-timeout 120 --request-timeout 120</pre></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-user-setup.html"><strong>Prev</strong>10.4. AWS API User Setup Steps</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="aws-ec2-supported-commands.html"><strong>Next</strong>10.6. Supported AWS API Calls</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-user-setup.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-user-setup.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-user-setup.html
new file mode 100644
index 0000000..6ce0d4f
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-ec2-user-setup.html
@@ -0,0 +1,45 @@
+<?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.4. AWS API User Setup Steps</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="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-configuration.html" title="10.3. Enabling the AWS API Compatible Interface" /><link rel="next" href="aws-ec2-timeouts.html" title="10.5. Using Timeouts to Ensure AWS API Command Completion" /></head><body><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="aws-ec2-configuration.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-timeouts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-user-setup" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-user-setup">10.4. AWS API User Setup Steps</h2></div></div></div><div class="para">
+		In general, users need not be aware that they are using a translation service provided by CloudStack. They need only send AWS API calls to CloudStack's endpoint, and it will translate the calls to the native API. Users of the Amazon EC2 compatible interface will be able to keep their existing EC2 tools and scripts and use them with their CloudStack deployment, by specifying the endpoint of the management server and using the proper user credentials. In order to do this, each user must perform the following configuration steps:
+	</div><div class="para">
+		<div class="itemizedlist"><ul><li class="listitem"><div class="para">
+					Generate user credentials and register with the service.
+				</div></li><li class="listitem"><div class="para">
+					Set up the environment variables for the EC2 command-line tools.
+				</div></li><li class="listitem"><div class="para">
+					For SOAP access, use the endpoint http://<em class="replaceable"><code>CloudStack-management-server</code></em>:8080/awsapi. The <em class="replaceable"><code>CloudStack-management-server</code></em> can be specified by a fully-qualified domain name or IP address.
+				</div></li></ul></div>
+
+	</div><div class="section" id="aws-ec2-user-registration"><div class="titlepage"><div><div><h3 class="title" id="aws-ec2-user-registration">10.4.1. AWS API User Registration</h3></div></div></div><div class="para">
+			Each user must perform a one-time registration. The user follows these steps:
+		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
+					Obtain the following by looking in the CloudStack UI, using the API, or asking the cloud administrator:
+				</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
+							The CloudStack server's publicly available DNS name or IP address
+						</div></li><li class="listitem"><div class="para">
+							The user account's API key and Secret key
+						</div></li></ul></div></li><li class="listitem"><div class="para">
+					Generate a private key and a self-signed X.509 certificate. The user substitutes their own desired storage location for /path/to/… below.
+				</div><div class="para">
+					
+<pre class="programlisting">$ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /path/to/private_key.pem -out /path/to/cert.pem</pre>
+
+				</div></li><li class="listitem"><div class="para">
+					Register the mapping from the X.509 certificate to the API/Secret keys. Download the following script from http://download.cloud.com/releases/3.0.3/cloudstack-aws-api-register and run it. Substitute the values that were obtained in step 1 in the URL below.
+				</div><div class="para">
+					
+<pre class="programlisting">$ cloudstack-aws-api-register --apikey=<em class="replaceable"><code>User’s CloudStack API key</code></em> --secretkey=<em class="replaceable"><code>User’s CloudStack Secret key</code></em> --cert=<em class="replaceable"><code>/path/to/cert.pem</code></em> --url=http://<em class="replaceable"><code>CloudStack.server</code></em>:8080/awsapi</pre>
+
+				</div></li></ol></div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
+				A user with an existing AWS certificate could choose to use the same certificate with CloudStack, but the public key would be uploaded to the CloudStack management server database.
+			</div></div></div></div><div class="section" id="aws-api-tools-setup"><div class="titlepage"><div><div><h3 class="title" id="aws-api-tools-setup">10.4.2. AWS API Command-Line Tools Setup</h3></div></div></div><div class="para">
+			To use the EC2 command-line tools, the user must perform these steps:
+		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
+					Be sure you have the right version of EC2 Tools. The supported version is available at <a href="http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip">http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip</a>.
+				</div></li><li class="listitem"><div class="para">
+					Set up the environment variables that will direct the tools to the server. As a best practice, you may wish to place these commands in a script that may be sourced before using the AWS API translation feature.
+				</div><pre class="programlisting">$ export EC2_CERT=/path/to/cert.pem
+$ export EC2_PRIVATE_KEY=/path/to/private_key.pem
+$ export EC2_URL=http://<em class="replaceable"><code>CloudStack.server</code></em>:8080/awsapi
+$ export EC2_HOME=/path/to/EC2_tools_directory</pre></li></ol></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-configuration.html"><strong>Prev</strong>10.3. Enabling the AWS API Compatible Interface</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="aws-ec2-timeouts.html"><strong>Next</strong>10.5. Using Timeouts to Ensure AWS API Command Co...</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-interface-compatibility.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-interface-compatibility.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-interface-compatibility.html
new file mode 100644
index 0000000..4b2c57d
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/aws-interface-compatibility.html
@@ -0,0 +1,3 @@
+<?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>Chapter 10. Amazon Web Service Interface Compatibility</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="index.html" title="CloudStack Installation Guide" /><link rel="prev" href="multi_site_deployment.html" title="9.5. Multi-Site Deployment" /><link rel="next" href="aws-ec2-introduction.html" title="10.1. Amazon Web Services EC2 Compatible Interface" /></head><body><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="multi_site_deployment.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-introduction.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="aws-interface-compatibility" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 10. Amazon Web Service Interface Compatibility</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="aws-ec2-introduction.html">10.1. Amazon Web Services EC2 Compatible Interface</a></span></dt><dt><span class="section"><a href="aws-ec2-requirements.html">10.2. System Requirements</a></span></dt><dt><span class="section"><a href="aws-ec2-configuration.html">10.3. Enabling the AWS API Compatible Interface</a></span></dt><dt><span class="section"><a href="aws-ec2-user
 -setup.html">10.4. AWS API User Setup Steps</a></span></dt><dd><dl><dt><span class="section"><a href="aws-ec2-user-setup.html#aws-ec2-user-registration">10.4.1. AWS API User Registration</a></span></dt><dt><span class="section"><a href="aws-ec2-user-setup.html#aws-api-tools-setup">10.4.2. AWS API Command-Line Tools Setup</a></span></dt></dl></dd><dt><span class="section"><a href="aws-ec2-timeouts.html">10.5. Using Timeouts to Ensure AWS API Command Completion</a></span></dt><dt><span class="section"><a href="aws-ec2-supported-commands.html">10.6. Supported AWS API Calls</a></span></dt></dl></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="multi_site_deployment.html"><strong>Prev</strong>9.5. Multi-Site Deployment</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="aws-ec2-introduction.html"><strong>Next</strong>1
 0.1. Amazon Web Services EC2 Compatible Interface</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/basic-zone-physical-network-configuration.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/basic-zone-physical-network-configuration.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/basic-zone-physical-network-configuration.html
new file mode 100644
index 0000000..61c3cef
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/basic-zone-physical-network-configuration.html
@@ -0,0 +1,12 @@
+<?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.4. Basic Zone Physical Network 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-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="networking-in-a-zone.html" title="15.3. Networking in a Zone" /><link rel="next" href="advanced-zone-physical-network-configuration.html" title="15.5. Advanced Zone Physical Network Configuration" /></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="networking-in-a-zone.html"><strong>Pr
 ev</strong></a></li><li class="next"><a accesskey="n" href="advanced-zone-physical-network-configuration.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="basic-zone-physical-network-configuration" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="basic-zone-physical-network-configuration">15.4. Basic Zone Physical Network Configuration</h2></div></div></div><div class="para">
+		In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to CloudPlatform, you set up the guest network through the Add Zone screens.
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="networking-in-a-zone.html"><strong>Prev</strong>15.3. Networking in a Zone</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="advanced-zone-physical-network-configuration.html"><strong>Next</strong>15.5. Advanced Zone Physical Network Configuration</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-templates.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-templates.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-templates.html
new file mode 100644
index 0000000..b8e1cf7
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-templates.html
@@ -0,0 +1,12 @@
+<?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>12.3. Best Practices for Templates</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-templates.html" title="Chapter 12. Working with Templates" /><link rel="prev" href="requirements-templates.html" title="12.2. Requirements for Templates" /><link rel="next" href="default-template.html" title="12.4. The Default Template" /></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="requirements-templates.html"><strong>Prev</strong></a></li><li class="next
 "><a accesskey="n" href="default-template.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="best-practices-templates" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="best-practices-templates">12.3. Best Practices for Templates</h2></div></div></div><div class="para">
+		If you plan to use large templates (100 GB or larger), be sure you have a 10-gigabit network to support the large templates. A slower network can lead to timeouts and other errors when large templates are used.
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="requirements-templates.html"><strong>Prev</strong>12.2. Requirements for Templates</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="default-template.html"><strong>Next</strong>12.4. The Default Template</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-vm.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-vm.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-vm.html
new file mode 100644
index 0000000..10cb9ff
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/best-practices-vm.html
@@ -0,0 +1,12 @@
+<?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.2. Best Practices for Virtual Machines</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="about-working-with-vms.html" title="10.1. About Working with Virtual Machines" /><link rel="next" href="vm-lifecycle.html" title="10.3. VM Lifecycle" /></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="about-working-with-vms.html"><strong>Prev</strong></a></li><li class="next">
 <a accesskey="n" href="vm-lifecycle.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="best-practices-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="best-practices-vm">10.2. Best Practices for Virtual Machines</h2></div></div></div><div class="para">
+		The CloudStack administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudStack global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this number of 
 VMs, use the CloudStack UI to disable allocation of more VMs to the cluster.
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="about-working-with-vms.html"><strong>Prev</strong>10.1. About Working with 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="vm-lifecycle.html"><strong>Next</strong>10.3. VM Lifecycle</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-database-config.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-database-config.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-database-config.html
new file mode 100644
index 0000000..d20df09
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-database-config.html
@@ -0,0 +1,12 @@
+<?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>18.2. Changing the Database 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-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="manage-cloud.html" title="Chapter 18. Managing the Cloud" /><link rel="prev" href="tagging-resources.html" title="18.1. Using Tags to Organize Resources in the Cloud" /><link rel="next" href="admin-alerts.html" title="18.3. Administrator Alerts" /></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="tagging-resources.html"><strong>Prev</strong></a></li><li class="next"><a acce
 sskey="n" href="admin-alerts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="change-database-config" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="change-database-config">18.2. Changing the Database Configuration</h2></div></div></div><div class="para">
+		The CloudStack Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server.
+	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="tagging-resources.html"><strong>Prev</strong>18.1. Using Tags to Organize Resources in the Clo...</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="admin-alerts.html"><strong>Next</strong>18.3. Administrator Alerts</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-host-password.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-host-password.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-host-password.html
new file mode 100644
index 0000000..9a70e05
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/change-host-password.html
@@ -0,0 +1,24 @@
+<?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.7. Changing Host Password</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="maintain-hypervisors-on-hosts.html" title="11.6. Maintaining Hypervisors on Hosts" /><link rel="next" href="host-allocation.html" title="11.8. Host Allocation" /></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="maintain-hypervisors-on-hosts.html"><strong>Prev</strong></a></li><li class
 ="next"><a accesskey="n" href="host-allocation.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="change-host-password" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="change-host-password">11.7. Changing Host Password</h2></div></div></div><div class="para">
+		The password for a XenServer Node, KVM Node, or vSphere Node may be changed in the database. Note that all Nodes in a Cluster must have the same password.
+	</div><div class="para">
+		To change a Node's password:
+	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
+				Identify all hosts in the cluster.
+			</div></li><li class="listitem"><div class="para">
+				Change the password on all hosts in the cluster. Now the password for the host and the password known to CloudStack will not match. Operations on the cluster will fail until the two passwords match.
+			</div></li><li class="listitem"><div class="para">
+				Get the list of host IDs for the host in the cluster where you are changing the password. You will need to access the database to determine these host IDs. For each hostname "h" (or vSphere cluster) that you are changing the password for, execute:
+			</div><pre class="programlisting">mysql&gt; select id from cloud.host where name like '%h%';</pre></li><li class="listitem"><div class="para">
+				This should return a single ID. Record the set of such IDs for these hosts.
+			</div></li><li class="listitem"><div class="para">
+				Update the passwords for the host in the database. In this example, we change the passwords for hosts with IDs 5, 10, and 12 to "password".
+			</div><pre class="programlisting">mysql&gt; update cloud.host set password='password' where id=5 or id=10 or id=12;</pre></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="maintain-hypervisors-on-hosts.html"><strong>Prev</strong>11.6. Maintaining Hypervisors on Hosts</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="host-allocation.html"><strong>Next</strong>11.8. Host Allocation</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8e353282/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/changing-service-offering-for-vm.html
----------------------------------------------------------------------
diff --git a/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/changing-service-offering-for-vm.html b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/changing-service-offering-for-vm.html
new file mode 100644
index 0000000..0b2729c
--- /dev/null
+++ b/docs/publish/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/changing-service-offering-for-vm.html
@@ -0,0 +1,30 @@
+<?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.8. Changing the Service Offering for a VM</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="changing-vm-name-os-group.html" title="10.7. Changing the VM Name, OS, or Group" /><link rel="next" href="manual-live-migration.html" title="10.9. Moving VMs Between Hosts (Manual Live Migration)" /></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="changing-vm-name-os-group.htm
 l"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="manual-live-migration.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="changing-service-offering-for-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="changing-service-offering-for-vm">10.8. Changing the Service Offering for a VM</h2></div></div></div><div class="para">
+		To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.
+	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
+				Log in to the CloudStack UI as a user or admin.
+			</div></li><li class="listitem"><div class="para">
+				In the left navigation, click Instances.
+			</div></li><li class="listitem"><div class="para">
+				Choose the VM that you want to work with.
+			</div></li><li class="listitem"><div class="para">
+				Click the Stop button to stop the VM 
+				<span class="inlinemediaobject"><img src="./images/stop-instance-icon.png" alt="StopButton.png: button to stop a VM" /></span>
+
+			</div></li><li class="listitem"><div class="para">
+				Click the Change Service button 
+				<span class="inlinemediaobject"><img src="./images/change-service-icon.png" alt="ChangeServiceButton.png: button to change the service of a VM" /></span>
+				. The Change service dialog box is displayed.
+			</div></li><li class="listitem"><div class="para">
+				Select the offering you want.
+			</div></li><li class="listitem"><div class="para">
+				Click OK.
+			</div></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="changing-vm-name-os-group.html"><strong>Prev</strong>10.7. Changing the VM Name, OS, or Group</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="manual-live-migration.html"><strong>Next</strong>10.9. Moving VMs Between Hosts (Manual Live Migra...</a></li></ul></body></html>