Skip to content

Commit

Permalink
Merge pull request #4180 from hashicorp/f-update-tf-version
Browse files Browse the repository at this point in the history
tf: Bump Nomad to 0.8.1, Hadoop to 2.7.6
  • Loading branch information
rcgenova authored Apr 19, 2018
2 parents 95d9eb9 + 61908a0 commit 45d0c88
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 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-d4b016ab"
ami = "ami-0ab81575"
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-d4b016ab"
ami = "ami-0ab81575"
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-d4b016ab"
ami = "ami-0ab81575"
instance_type = "t2.medium"
key_name = "KEY_NAME"
server_count = "3"
Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/scripts/client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONFIGDIR=/ops/shared/config

CONSULCONFIGDIR=/etc/consul.d
NOMADCONFIGDIR=/etc/nomad.d
HADOOP_VERSION=hadoop-2.7.5
HADOOP_VERSION=hadoop-2.7.6
HADOOPCONFIGDIR=/usr/local/$HADOOP_VERSION/etc/hadoop
HOME_DIR=ubuntu

Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/scripts/server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIGDIR=/ops/shared/config
CONSULCONFIGDIR=/etc/consul.d
VAULTCONFIGDIR=/etc/vault.d
NOMADCONFIGDIR=/etc/nomad.d
HADOOP_VERSION=hadoop-2.7.5
HADOOP_VERSION=hadoop-2.7.6
HADOOPCONFIGDIR=/usr/local/$HADOOP_VERSION/etc/hadoop
HOME_DIR=ubuntu

Expand Down
4 changes: 2 additions & 2 deletions terraform/shared/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ VAULTDOWNLOAD=https://releases.hashicorp.com/vault/${VAULTVERSION}/vault_${VAULT
VAULTCONFIGDIR=/etc/vault.d
VAULTDIR=/opt/vault

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

HADOOP_VERSION=2.7.5
HADOOP_VERSION=2.7.6

# Dependencies
sudo apt-get install -y software-properties-common
Expand Down

0 comments on commit 45d0c88

Please sign in to comment.