Skip to content

Commit

Permalink
updated the docs to note exporting the AWS_DEFAULT_REGION per issue h…
Browse files Browse the repository at this point in the history
  • Loading branch information
Weston Bassler committed Sep 24, 2018
1 parent a39084f commit 898f489
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 11 deletions.
21 changes: 17 additions & 4 deletions docs/ee/QUICKSTART.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,31 @@ If you’re new to Terraform and/or want to deploy DC/OS on AWS quickly and effo

# Prerequisites:

You’ll need Terraform.
## You’ll need Terraform.

If you're on a Mac environment with homebrew installed, run this command.
```bash
brew install terraform
```

For more information on using the AWS Provider with Terraform, see [here](https://www.terraform.io/docs/providers/aws/).
For help installing Terraform on a different OS, see [here](https://www.terraform.io/downloads.html):

For help installing Terraform on a different OS, see [here]().

DC/OS Enterprise Edition also requires a valid license key provided by Mesosphere that we will pass into our `main.tf` as `dcos_license_key_contents`. You are also going to be required to generate a password hash (see next step below) that you will also pass to the in the `main.tf` to set the password for your desired superuser.
## Ensure AWS Default Region
Current Terraform AWS Provider requires that the default region variable be set. You can set the default region using the following command:
```bash
export AWS_DEFAULT_REGION="desired-aws-region"
```
Example:
```bash
export AWS_DEFAULT_REGION="us-east-1"
```

Ensure it is set:
```bash
> echo $AWS_DEFAULT_REGION
us-east-1
```

# Generating Password Hash
For Enterprise Edition, you need to generate a password hash for the superuser account in the cluster. You can generate this hash downloading the installation script and running the following:
Expand Down
24 changes: 21 additions & 3 deletions docs/open/QUICKSTART.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,34 @@ If you’re new to Terraform and/or want to deploy DC/OS on AWS quickly and effo

# Prerequisites:

You’ll need Terraform.
## You’ll need Terraform.

If you're on a Mac environment with homebrew installed, run this command.
```bash
brew install terraform
```

For more information on using the AWS Provider with Terraform, see [here](https://www.terraform.io/docs/providers/aws/).
For help installing Terraform on a different OS, see [here](https://www.terraform.io/downloads.html):


## Ensure AWS Default Region
Current Terraform AWS Provider requires that the default region variable be set. You can set the default region using the following command:
```bash
export AWS_DEFAULT_REGION="desired-aws-region"
```
Example:
```bash
export AWS_DEFAULT_REGION="us-east-1"
```

Ensure it is set:
```bash
> echo $AWS_DEFAULT_REGION
us-east-1
```


For help installing Terraform on a different OS, see [here]():
For more information on using the AWS Provider with Terraform, see [here](https://www.terraform.io/docs/providers/aws/).

# Creating a Cluster

Expand Down
6 changes: 2 additions & 4 deletions examples/simple-open-source/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ variable "cluster_name" {
}

variable "ssh_public_key_file" {
description = <<EOF
Specify a SSH public key in authorized keys format (e.g. "ssh-rsa ..") to be used with the instances. Make sure you added this key to your ssh-agent
EOF
description = "Path to an SSH public key to be used with the instances. Make sure you added this key to your ssh-agent"
}

variable "tags" {
Expand All @@ -32,4 +30,4 @@ module "dcos" {

output "cluster-address" {
value = "${module.dcos.masters-loadbalancer}"
}
}

0 comments on commit 898f489

Please sign in to comment.