Skip to content

Commit

Permalink
Prepare version v0.6.0-dcos-1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Repnak committed Mar 10, 2018
1 parent 72f2a1e commit c091c7d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* Bumps Docker version to 17.05.0.ce
* Adopts Makefile approach for easy setup
* Docs improvements
* #8 On-Premises: added possibility to use other device names for existing network interface

## v0.5.0-dcos-1.10

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ Use `git tag` to list all versions:

```
git tag
v0.5.0-dcos-1.10
v0.6.0-dcos-1.11
```

Check out the latest version with:

```
git checkout v0.5.0-dcos-1.10
git checkout v0.6.0-dcos-1.11
```

## Install
Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL_AWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ make aws

### Configure your AWS ssh Keys

In the `variables.tf` there is a `key_name` variable. This key must be added to your host machine running your terraform script as it will be used to log into the machines to run setup scripts. The default is `default`. You can find aws documentation that talks about this [here](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#how-to-generate-your-own-key-and-import-it-to-aws).
In the file `desired_cluster_profile` there is a `key_name` variable. This key must be added to your host machine running your terraform script as it will be used to log into the machines to run setup scripts. The default is `default`. You can find aws documentation that talks about this [here](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#how-to-generate-your-own-key-and-import-it-to-aws).

When you have your key available, you can use ssh-add.

Expand Down Expand Up @@ -47,15 +47,15 @@ For example, you can see the default configuration of your cluster:

```bash
$ cat desired_cluster_profile
os = "centos_7.3"
os = "centos_7.4"
state = "none"
#
num_of_masters = "1"
num_of_private_agents = "3"
num_of_public_agents = "1"
#
aws_region = "us-west-1"
aws_bootstrap_instance_type = "m3.large"
aws_bootstrap_instance_type = "m4.large"
aws_master_instance_type = "m4.2xlarge"
aws_agent_instance_type = "m4.2xlarge"
aws_public_agent_instance_type = "m4.2xlarge"
Expand Down
2 changes: 1 addition & 1 deletion group_vars/all.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cluster_name: demo

# Download URL for DC/OS
dcos_download: https://downloads.dcos.io/dcos/stable/1.10.2/dcos_generate_config.sh
dcos_download: https://downloads.dcos.io/dcos/stable/1.11.0/dcos_generate_config.sh

# Install latest operating system updates
# options: true, false
Expand Down
5 changes: 2 additions & 3 deletions resources/desired_cluster_profile.aws
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

os = "centos_7.3"
os = "centos_7.4"
state = "none"
#
num_of_masters = "1"
num_of_private_agents = "3"
num_of_public_agents = "1"
#
aws_region = "us-west-1"
aws_bootstrap_instance_type = "m3.large"
aws_bootstrap_instance_type = "m4.large"
aws_master_instance_type = "m4.2xlarge"
aws_agent_instance_type = "m4.2xlarge"
aws_public_agent_instance_type = "m4.2xlarge"
Expand Down

0 comments on commit c091c7d

Please sign in to comment.