Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Cloud link to Azure topics #2713

Merged
merged 16 commits into from
May 2, 2017
Merged

Add Cloud link to Azure topics #2713

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
697b86d
add Cloud link to Azure topics
Apr 10, 2017
063ce64
screen snaps, updates per latest on staging
Apr 26, 2017
7e45993
added link
Apr 26, 2017
7a4c5cd
resolved conflicts in TOC
Apr 26, 2017
3d545fc
added Azure accept EULA/enable subscription, more steps, snaps
Apr 26, 2017
67e2beb
fixed the comments to not break numbering
Apr 26, 2017
432f222
new snaps and review comments incorporated from Alberto and Ryan
Apr 27, 2017
6d057d1
added screen snaps, review comments, more steps
Apr 27, 2017
a6f9028
added screen snaps, detail to Azure create swarm
Apr 29, 2017
d397f53
new snap showing linked AWS as provider
May 1, 2017
516f12c
AWS screen snaps and detailed steps
May 2, 2017
9149e96
AWS swarm name rules clarification
May 2, 2017
94ea376
added x-refs to edition topics on config per reviews
May 2, 2017
de360fd
added connect screen snap w/production commands, AWS pricing
May 2, 2017
6c6f72a
added more code examples and clarification to swarm connect
May 2, 2017
04a28da
added more code examples for Azure and AWS
May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added screen snaps, review comments, more steps 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
  • Loading branch information
Victoria Bialas committed May 2, 2017
commit 6d057d1f4bc838b10f280b31fd37930eaf07c007
10 changes: 7 additions & 3 deletions docker-cloud/cloud-swarm/create-cloud-swarm-aws.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you haven't yet linked Docker Cloud to AWS, follow the steps in [Link Amazon
linked, it will show up on the **Swarms -> Create** page as a connected service
provider.

<font style="color:red;">TBD - ADD SCREEN SNAP HERE</font>
![](images/aws-creds-cloud.png)

## Create a swarm

Expand All @@ -32,7 +32,7 @@ provider.

<font style="color:red;">TBD: MAKE THIS SPECIFIC TO AWS AND ADD IMAGES THROUGHOUT</font>

Additional options appear depending on which provider you select.
<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>

5. Enter any additional provider-specific information, such as region.

Expand All @@ -48,7 +48,11 @@ provider.

9. Click **Create**.

Docker Cloud connects to your AWS account, deploys Docker for AWS instances, forms a Swarm, and joins the instances to it.
Docker for AWS bootstraps all of the recommended infrastructure to
start using Docker on AWS automatically. You don't need to worry
about rolling your own instances, security groups, or load balancers
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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since users will be able to remove nodes from a swarm via the Terminate option, let's remove the "remove nodes" references in this section.

log in to your AWS account, and add or delete nodes manually. (You can
Expand Down
11 changes: 6 additions & 5 deletions docker-cloud/cloud-swarm/create-cloud-swarm-azure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,13 @@ provider.

![](images/azure-create-swarm.png)

<font style="color:red;">RYAN, ALBERTO: Need help here ^^ with screen snaps and proper instructions. (I don't have CE subscription enabled in Azure yet, and am not sure what to provide as "App name")</font>

6. Choose how many swarm managers and swarm worker nodes to deploy.

<font style="color:red;">TBD, RYAN, ALBERTO: More images and/or different Azure specific steps?</font>
<font style="color:red;">TBD, fill in more details here, maybe screen snaps</font>

7. Select the machine sizes for the managers, and for the workers.

<font style="color:red;">TBD, RYAN, ALBERTO: More images and/or different Azure specific steps?</font>
<font style="color:red;">TBD, fill in more details here, maybe screen snaps</font>

8. Copy-paste the public SSH key you want to use to connect to the nodes.

Expand All @@ -52,7 +50,10 @@ provider.

9. Click **Create**.

Docker Cloud connects to your Microsoft Azure account, deploys Docker for Azure virtual machines, forms a Swarm, and joins the nodes to it.
Docker for Azure bootstraps all of the recommended infrastructure to start
using Docker on Azure automatically. You don’t need to worry about rolling
your own instances, security groups, or load balancers when using Docker for
Azure. (To learn more, see [Why Docker for Azure](/docker-for-azure/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 Azure account, and add or delete nodes manually. (You can
Expand Down
Binary file added docker-cloud/cloud-swarm/images/aws-arn-wizard.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docker-cloud/cloud-swarm/images/aws-create-swarm-vpc.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docker-cloud/cloud-swarm/images/aws-creds-cloud.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docker-cloud/cloud-swarm/images/azure-creds-cloud.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 21 additions & 16 deletions docker-cloud/cloud-swarm/link-aws-swarm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ the new policy to your existing role by following the instructions

AWS IAM creates the new role and returns you to the **Roles** list.

9. Click the name of the role you just created to view its details.
9. Click the name of the role you just created to view its details.
10. On the **Permissions** tab, click the carat icon next to **Inline Policies** to expand the section.
11. In the **Inline Policies** section, click the link to create a policy.
12. On the next page, click **Custom Policy** and click **Select**.
Expand All @@ -60,21 +60,21 @@ the new policy to your existing role by following the instructions

If you already have your AWS account connected to Docker Cloud and used the legacy node cluster functionality you will need to create and attach a new policy, and re-link your account.

1. Go to the AWS IAM Roles list at <a href="https://console.aws.amazon.com/iam/home#roles">https://console.aws.amazon.com/iam/home#roles</a>.
2. Click your existing version of the `dockercloud-role`.
3. On the **Permissions** tab, click the carat icon next to **Inline Policies** to expand the section.
4. Click the link in the **Inline Policies** section to create a policy.
5. On the next page, click **Custom Policy** and click **Select**.
6. On the **Policy Editor** page that appears, give the policy a name like `dockercloud-swarm-policy`.
7. In the **Policy Document** section, copy and paste the policy document found in the [Docker for AWS page](/docker-for-aws/iam-permissions/).
8. Click **Create Policy**.
9. Select and copy the **Role ARN** on the role screen.
1. Go to the AWS IAM Roles list at <a href="https://console.aws.amazon.com/iam/home#roles">https://console.aws.amazon.com/iam/home#roles</a>.
2. Click your existing version of the `dockercloud-role`.
3. On the **Permissions** tab, click the carat icon next to **Inline Policies** to expand the section.
4. Click the link in the **Inline Policies** section to create a policy.
5. On the next page, click **Custom Policy** and click **Select**.
6. On the **Policy Editor** page that appears, give the policy a name like `dockercloud-swarm-policy`.
7. In the **Policy Document** section, copy and paste the policy document found in the [Docker for AWS page](/docker-for-aws/iam-permissions/).
8. Click **Create Policy**.
9. Select and copy the **Role ARN** on the role screen.
It shouldn't have changed, but you'll use it to re-link your account.

Because you edited the role's permissions, you need to re-link to your account.
Back in Docker Cloud, click the account menu and select **Cloud Settings**, and
in the **Cloud providers** section, click the green plug icon to unlink your AWS
account.
in the **Service providers** section, click the green plug icon to unlink your
AWS account.

Then follow the instructions below to re-link your account.

Expand All @@ -84,10 +84,15 @@ Once you've created the a `dockercloud-swarm-policy`, added the
`dockercloud-swarm-role` inline, and have the role's Role ARN, go back to Docker
Cloud to connect the account.

1. In Docker Cloud, click the account menu at upper right and select **Cloud settings**.
2. In the **Cloud Providers** section, click the plug icon next to Amazon Web Services.
3. Enter the full `Role ARN` for the role you just created.
4. Click **Save**.
1. In Docker Cloud, click the account menu at upper right and select **Cloud settings**.
2. In the **Service providers** section, click the plug icon next to Amazon Web Services.

![](images/aws-arn-wizard.png)

3. Enter the full `Role ARN` for the role you just created.
4. Click **Save**.

![](images/aws-creds-cloud.png)

You're now ready to deploy a swarm!

Expand Down