AWS screen snaps and detailed steps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
docker · londoncalling · May 2, 2017 · Apr 10, 2017 · Apr 26, 2017 · Apr 26, 2017
commit 516f12cd1d7e49b0f4fbd085152ac9dce8f35854
diff --git a/docker-cloud/cloud-swarm/connect-to-swarm.md b/docker-cloud/cloud-swarm/connect-to-swarm.md
@@ -42,6 +42,9 @@ local Docker instance, which connects to a manager node on the target swarm.
     to manage your cloud-hosted [swarm mode](/engine/swarm/) just as you
     would a local swarm.
 
+7.  Now that your swarm is set up, try out the example to [deploy a service to the swarm](/engine/swarm/swarm-tutorial/deploy-service/),
+and other subsequent tasks in the Swarm getting started tutorial.
+
 > **Note**: To switch back to Docker hosts you can either run the `export` command again to overwrite it, or use `unset DOCKER_HOST`. If you are using Docker Machine, be sure to unset `DOCKER_TLS_VERIFY` as described in the [known issues](https://github.com/moby/mobycloud-federation#known-issues).
 
 ## Reconnect a swarm

diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md b/docker-cloud/cloud-swarm/create-cloud-swarm-aws.md
@@ -24,27 +24,65 @@ provider.
 
 2. Click **Swarms** in the top navigation, then click **Create**.
 
-    >**Tip:** Alternatively, you can select **+ -> Swarm** from the top navigation to get to the same page.
+    Alternatively, you can select **+ -> Swarm** from the top navigation to get to the same page.
 
-3. Enter a name for the new swarm.
+3.  Enter a name for the new swarm.
 
-4. Select a connected cloud services provider.
+    Your Docker ID is pre-populated. In the example, our swarm name
+    is "vote-swarm".
 
-    <font style="color:red;">TBD: MAKE THIS SPECIFIC TO AWS AND ADD IMAGES THROUGHOUT</font>
+    ![](images/aws-create-swarm-1-name.png)
 
-    <font style="color:red;">TBD from here down, Add info re: VPC for Region Advanced Settings, and other generic or AWS specific configurations. Generic configurations seem to be Swarm size and properties, along with manager and worker properties. (See Azure steps, which briefly cover these generic configs.)</font>
+    >**Tip:** Use all lower case letters for swarm names. No spaces, capitalized letters, or special characters other than `.`, `_`, or `-` are allowed.
 
-5. Enter any additional provider-specific information, such as region.
+4.  Select Amazon Web Services as the service provider, select a channel (`Stable` or `Edge`) from the drop-down menu, and provide an App name.
 
-    > **Note:** For Amazon Web Services, the SSH keys that appear in this wizard are filtered by the region you select. Make sure that you have appropriate SSH keys available on the region you select.
+    In this example, we'll use the `Stable` channel, and use "voting_app" as our application name.
 
-6. Choose how many swarm managers and swarm worker nodes to deploy.
+    ![](images/aws-create-swarm-0.png)
+
+5.  Select a **Region** from the drop-down menu.
+
+    > **Tip:** The SSH keys available to you in the next steps are
+    filtered by the region you select here. Make sure that you have
+    appropriate SSH keys available on the region you select.
+
+    Optionally, click **Region Advanced Settings** to configure a
+    [Virtual Private Cloud(VPC)](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Introduction.html) on which to run this swarm.
+
+    ![](images/aws-create-swarm-3-region.png)
+
+    For guidance on setting up a VPC, see [Recommended VPC and subnet setup](https://docs.docker.com/docker-for-aws/faqs/#can-i-use-my-existing-vpc) in the Docker for AWS topics.
+
+6.  Choose how many swarm managers and swarm worker nodes to deploy.
+
+    Here, we create one manager and two worker nodes. (This maps nicely to the [Swarm tutorial setup](/engine/swarm/swarm-tutorial/index.md) and the [voting app sample in Docker Labs](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md).)
+
+    ![](images/cloud-create-swarm-4-size.png)
+
+7.  Configure swarm properties.
+
+    ![](images/aws-create-swarm-5-properties.png)
+
+    * Select a public SSH key for Docker Cloud to use to connect to the
+    nodes on AWS. Public keys from the [key pairs you configured on AWS](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html) are provided in the drop-down menu. Only keys associated with the
+    Region you selected (in step 5) are shown.
+
+    * Choose whether to provide daily resource cleanup.
+
+    * Enable or disable Cloudwatch for container logging. (It is enabled by default.)
+
+    <font style="color:red;">
+    RYAN, ALBERTO:<br>
+    Can you provide more detail here on what daily resource cleanup does and pros and cons of having this on/off?<br><br>
+    Same for Cloudwatch for container logging, can you provide more detail?
+    </font>
 
 7. Select the instance sizes for the managers, and for the workers.
 
-8. Select the SSH key to use to connect to the nodes.
+    ![](images/aws-create-swarm-6-manager-worker.png)
 
-    The list contains any SSH keys that you have access to on your linked cloud services provider. Select the one for which you have the private key locally.
+    <font style="color:red;">RYAN, ALBERTO: Should we add more detail on machine sizes?</font>
 
 9. Click **Create**.
 
@@ -54,9 +92,14 @@ provider.
     when using Docker for AWS. (To learn more, see
     [Why Docker for AWS](/docker-for-aws/why.md).)
 
-> **Note**: At this time, you cannot add or remove nodes from a swarm from within Docker Cloud. To add new nodes or remove nodes from an existing swarm,
-log in to your AWS account, and add or delete nodes manually. (You can
-unregister or dissolve swarms directly from Docker Cloud.)
+    This will take a few minutes. When the swarm is ready, its indicator on the Swarms page will show steady green.
+
+    ![](images/aws-create-swarm-7-list.png)
+
+    > **Note**: At this time, you cannot add nodes to a swarm from
+    within Docker Cloud. To add new nodes to an existing swarm,
+    log in to your AWS account, and add nodes manually. (You can
+    unregister or dissolve swarms directly from Docker Cloud.)
 
 ## Where to go next
 

diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md b/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md
@@ -24,19 +24,22 @@ provider.
 
 2.  Click **Swarms** in the top navigation, then click **Create**.
 
-    Alternatively, you can select **+ -> Swarm** from the top navigation to get to the same page.
+    Alternatively, you can select **+ -> Swarm** from the top navigation to
+    get to the same page.
 
 3.  Enter a name for the new swarm.
 
-    Your Docker ID is pre-populated. In the example, our swarm name is "vote_swarm".
+    Your Docker ID is pre-populated. In the example, our swarm name
+    is "vote_swarm".
 
     ![](images/azure-create-swarm-1-name.png)
 
     >**Tip:** Use all lower case letters for swarm names. No spaces, capitalized letters, or special characters other than `.`, `_`, or `-` are allowed.
 
-4.  Select Microsoft Azure as the service provider, provide Docker Azure CE as the App name, and select your Azure subscription from the drop-down menu.
+4.  Select Microsoft Azure as the service provider, select a channel (`Stable` or `Edge`) from the drop-down menu, provide an App name, and select the Azure
+Subscription you want to use.
 
-    In this example, our app name is "voting_app" and we use a Pay-As-You-Go subscription.
+    In this example, we'll use the `Stable` channel, our app name is "voting_app" and we've selected a Pay-As-You-Go subscription.
 
     ![](images/azure-create-swarm-0.png)
 
@@ -52,7 +55,7 @@ provider.
 
     Here, we create one manager and two worker nodes. (This maps nicely to the [Swarm tutorial setup](/engine/swarm/swarm-tutorial/index.md) and the [voting app sample in Docker Labs](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md).)
 
-    ![](images/azure-create-swarm-4-size.png)
+    ![](images/cloud-create-swarm-4-size.png)
 
 8.  Configure swarm properties, SSH key and resource cleanup.
 
@@ -64,7 +67,7 @@ provider.
 
     * To copy the public SSH key to your clipboard: `$ pbcopy < ~/.ssh/id_rsa.pub`
 
-    Chose whether to provide daily resource cleanup.
+    Choose whether to provide daily resource cleanup.
 
     <font style="color:red;">RYAN, ALBERTO: Can you provide more detail here on what cleanup does and pros and cons of having this on/off?</font>
 
@@ -83,11 +86,12 @@ provider.
 
     This will take a few minutes. When the swarm is ready, its indicator on the Swarms page will show steady green.
 
-    ![](images/azure-create-swarm-7-list-callout.png)
+    ![](images/azure-create-swarm-7-list.png)
 
-> **Note**: At this time, you cannot add or remove nodes from a swarm from within Docker Cloud. To add new nodes or remove nodes from an existing swarm,
-log in to your Azure account, and add or delete nodes manually. (You can
-unregister or dissolve swarms directly from Docker Cloud.)
+    > **Note**: At this time, you cannot add nodes to a swarm from
+    within Docker Cloud. To add new nodes to an existing swarm,
+    log in to your AWS account, and add nodes manually. (You can
+    unregister or dissolve swarms directly from Docker Cloud.)
 
 ## Where to go next
 

diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-0.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-0.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-1-name.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-1-name.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-3-region-x.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-3-region-x.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-3-region.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-3-region.png
diff --git a/...warm/images/azure-create-swarm-4-size.png → ...-swarm/images/aws-create-swarm-4-size.png b/...warm/images/azure-create-swarm-4-size.png → ...-swarm/images/aws-create-swarm-4-size.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-5-properties.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-5-properties.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-6-manager-worker.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-6-manager-worker.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-7-list-x.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-7-list-x.png
diff --git a/docker-cloud/cloud-swarm/images/aws-create-swarm-7-list.png b/docker-cloud/cloud-swarm/images/aws-create-swarm-7-list.png
diff --git a/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list-callout.png b/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list-callout.png
diff --git a/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list-x.png b/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list-x.png
diff --git a/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list.png b/docker-cloud/cloud-swarm/images/azure-create-swarm-7-list.png
diff --git a/docker-cloud/cloud-swarm/images/cloud-create-swarm-4-size.png b/docker-cloud/cloud-swarm/images/cloud-create-swarm-4-size.png