From 5bcf32282f12d88e1117d4bdf45a9a74db7fd9a4 Mon Sep 17 00:00:00 2001 From: Rob Genova Date: Wed, 26 Jul 2017 22:34:34 +0000 Subject: [PATCH] Update scripts and AMI to reflect Nomad 0.6 --- terraform/README.md | 2 +- terraform/aws/env/us-east/terraform.tfvars | 2 +- terraform/examples/spark/README.md | 2 +- terraform/shared/scripts/setup.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/README.md b/terraform/README.md index e4525465c..aa7f01e66 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -49,7 +49,7 @@ Update terraform.tfvars with your SSH key name: ```bash region = "us-east-1" -ami = "ami-76787e60" +ami = "ami-577d212c" instance_type = "t2.medium" key_name = "KEY_NAME" server_count = "3" diff --git a/terraform/aws/env/us-east/terraform.tfvars b/terraform/aws/env/us-east/terraform.tfvars index 98d4c018b..3d86f3bcd 100644 --- a/terraform/aws/env/us-east/terraform.tfvars +++ b/terraform/aws/env/us-east/terraform.tfvars @@ -1,5 +1,5 @@ region = "us-east-1" -ami = "ami-76787e60" +ami = "ami-577d212c" instance_type = "t2.medium" key_name = "KEY_NAME" server_count = "1" diff --git a/terraform/examples/spark/README.md b/terraform/examples/spark/README.md index 6f2dceeb1..d0264779e 100644 --- a/terraform/examples/spark/README.md +++ b/terraform/examples/spark/README.md @@ -123,7 +123,7 @@ spark-submit \ --conf spark.eventLog.dir=hdfs://hdfs.service.consul/spark-events \ --conf spark.nomad.sparkDistribution=https://s3.amazonaws.com/nomad-spark/spark-2.1.0-bin-nomad.tgz \ https://s3.amazonaws.com/nomad-spark/spark-examples_2.11-2.1.0-SNAPSHOT.jar \ - /home/ubuntu/.bashrc hdfs://hdfs.service.consul/foo + /etc/sudoers hdfs://hdfs.service.consul/foo ``` ### spark-shell diff --git a/terraform/shared/scripts/setup.sh b/terraform/shared/scripts/setup.sh index 732a4ad30..71ee8eea6 100644 --- a/terraform/shared/scripts/setup.sh +++ b/terraform/shared/scripts/setup.sh @@ -6,7 +6,7 @@ cd /ops CONFIGDIR=/ops/shared/config -CONSULVERSION=0.8.4 +CONSULVERSION=0.9.0 CONSULDOWNLOAD=https://releases.hashicorp.com/consul/${CONSULVERSION}/consul_${CONSULVERSION}_linux_amd64.zip CONSULCONFIGDIR=/etc/consul.d CONSULDIR=/opt/consul @@ -16,7 +16,7 @@ VAULTDOWNLOAD=https://releases.hashicorp.com/vault/${VAULTVERSION}/vault_${VAULT VAULTCONFIGDIR=/etc/vault.d VAULTDIR=/opt/vault -NOMADVERSION=0.5.6 +NOMADVERSION=0.6.0 NOMADDOWNLOAD=https://releases.hashicorp.com/nomad/${NOMADVERSION}/nomad_${NOMADVERSION}_linux_amd64.zip NOMADCONFIGDIR=/etc/nomad.d NOMADDIR=/opt/nomad