Skip to content

Commit

Permalink
Merge pull request #4155 from hashicorp/f-tf-update-ami
Browse files Browse the repository at this point in the history
tf: Update to Nomad 0.8, Consul 1.0.7, and Vault 0.10
  • Loading branch information
rcgenova authored Apr 16, 2018
2 parents 4cbaec4 + 500c397 commit e0913af
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions terraform/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ a custom AMI:

```bash
region = "us-east-1"
ami = "ami-3330e54e"
ami = "ami-d4b016ab"
instance_type = "t2.medium"
key_name = "KEY_NAME"
server_count = "3"
Expand All @@ -57,7 +57,7 @@ variable like so:

```bash
region = "us-east-1"
ami = "ami-3330e54e"
ami = "ami-d4b016ab"
instance_type = "t2.medium"
key_name = "KEY_NAME"
server_count = "3"
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws/env/us-east/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
region = "us-east-1"
ami = "ami-3330e54e"
ami = "ami-d4b016ab"
instance_type = "t2.medium"
key_name = "KEY_NAME"
server_count = "3"
Expand Down
6 changes: 3 additions & 3 deletions terraform/shared/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ cd /ops

CONFIGDIR=/ops/shared/config

CONSULVERSION=1.0.6
CONSULVERSION=1.0.7
CONSULDOWNLOAD=https://releases.hashicorp.com/consul/${CONSULVERSION}/consul_${CONSULVERSION}_linux_amd64.zip
CONSULCONFIGDIR=/etc/consul.d
CONSULDIR=/opt/consul

VAULTVERSION=0.9.6
VAULTVERSION=0.10.0
VAULTDOWNLOAD=https://releases.hashicorp.com/vault/${VAULTVERSION}/vault_${VAULTVERSION}_linux_amd64.zip
VAULTCONFIGDIR=/etc/vault.d
VAULTDIR=/opt/vault

NOMADVERSION=0.7.1
NOMADVERSION=0.8.0
NOMADDOWNLOAD=https://releases.hashicorp.com/nomad/${NOMADVERSION}/nomad_${NOMADVERSION}_linux_amd64.zip
NOMADCONFIGDIR=/etc/nomad.d
NOMADDIR=/opt/nomad
Expand Down

0 comments on commit e0913af

Please sign in to comment.