luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #2914 from hashicorp/f-terraform-update 

Update scripts and AMI to reflect Nomad 0.6
This commit is contained in:
Rob Genova 2017-07-26 18:36:57 -04:00 committed by GitHub
parent 5e1b52ba68 5bcf32282f
commit 81db9a46a9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terraform/README.md
View File

@ -49,7 +49,7 @@ Update terraform.tfvars with your SSH key name:
```bash ```bash
region = "us-east-1" region = "us-east-1"
ami = "ami-76787e60" ami = "ami-577d212c"
instance_type = "t2.medium" instance_type = "t2.medium"
key_name = "KEY_NAME" key_name = "KEY_NAME"
server_count = "3" server_count = "3"

2
terraform/aws/env/us-east/terraform.tfvars vendored
View File

@ -1,5 +1,5 @@
region = "us-east-1" region = "us-east-1"
ami = "ami-76787e60" ami = "ami-577d212c"
instance_type = "t2.medium" instance_type = "t2.medium"
key_name = "KEY_NAME" key_name = "KEY_NAME"
server_count = "1" server_count = "1"

2
terraform/examples/spark/README.md
View File

@ -123,7 +123,7 @@ spark-submit \
--conf spark.eventLog.dir=hdfs://hdfs.service.consul/spark-events \ --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 \ --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 \ 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 ### spark-shell

4
terraform/shared/scripts/setup.sh
View File

@ -6,7 +6,7 @@ cd /ops
CONFIGDIR=/ops/shared/config CONFIGDIR=/ops/shared/config
CONSULVERSION=0.8.4 CONSULVERSION=0.9.0
CONSULDOWNLOAD=https://releases.hashicorp.com/consul/${CONSULVERSION}/consul_${CONSULVERSION}_linux_amd64.zip CONSULDOWNLOAD=https://releases.hashicorp.com/consul/${CONSULVERSION}/consul_${CONSULVERSION}_linux_amd64.zip
CONSULCONFIGDIR=/etc/consul.d CONSULCONFIGDIR=/etc/consul.d
CONSULDIR=/opt/consul CONSULDIR=/opt/consul
@ -16,7 +16,7 @@ VAULTDOWNLOAD=https://releases.hashicorp.com/vault/${VAULTVERSION}/vault_${VAULT
VAULTCONFIGDIR=/etc/vault.d VAULTCONFIGDIR=/etc/vault.d
VAULTDIR=/opt/vault VAULTDIR=/opt/vault
NOMADVERSION=0.5.6 NOMADVERSION=0.6.0
NOMADDOWNLOAD=https://releases.hashicorp.com/nomad/${NOMADVERSION}/nomad_${NOMADVERSION}_linux_amd64.zip NOMADDOWNLOAD=https://releases.hashicorp.com/nomad/${NOMADVERSION}/nomad_${NOMADVERSION}_linux_amd64.zip
NOMADCONFIGDIR=/etc/nomad.d NOMADCONFIGDIR=/etc/nomad.d
NOMADDIR=/opt/nomad NOMADDIR=/opt/nomad