From 6a6f9ca5da032488fdbcf98d2e936b9bde49fa8d Mon Sep 17 00:00:00 2001
From: Rob Genova <rcgenova@gmail.com>
Date: Sun, 25 Jun 2017 10:09:54 -0700
Subject: [PATCH] various script and config file tweaks

---
 terraform/shared/config/consul.json      |  2 +-
 terraform/shared/config/nomad.hcl        |  2 +-
 terraform/shared/config/nomad_client.hcl |  2 +-
 terraform/shared/scripts/server.sh       | 13 +++++++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/terraform/shared/config/consul.json b/terraform/shared/config/consul.json
index 6a99c1b49..c1eb0f6fa 100644
--- a/terraform/shared/config/consul.json
+++ b/terraform/shared/config/consul.json
@@ -3,7 +3,7 @@
   "server": true,
   "data_dir": "/opt/consul/data",
   "bind_addr": "0.0.0.0",
-  "client_addr": "IP_ADDRESS",
+  "client_addr": "0.0.0.0",
   "advertise_addr": "IP_ADDRESS",
   "bootstrap_expect": SERVER_COUNT,
   "service": {
diff --git a/terraform/shared/config/nomad.hcl b/terraform/shared/config/nomad.hcl
index b42311c35..990decaa6 100644
--- a/terraform/shared/config/nomad.hcl
+++ b/terraform/shared/config/nomad.hcl
@@ -15,7 +15,7 @@ consul {
 
 vault {
   enabled = false
-  address = "http://IP_ADDRESS:8200"
+  address = "vault.service.consul"
   task_token_ttl = "1h"
   create_from_role = "nomad-cluster"
   token = ""
diff --git a/terraform/shared/config/nomad_client.hcl b/terraform/shared/config/nomad_client.hcl
index 96bc440b4..0025c0147 100644
--- a/terraform/shared/config/nomad_client.hcl
+++ b/terraform/shared/config/nomad_client.hcl
@@ -24,5 +24,5 @@ consul {
 
 vault {
   enabled = true
-  address = "http://SERVER_IP_ADDRESS:8200"
+  address = "vault.service.consul"
 }
diff --git a/terraform/shared/scripts/server.sh b/terraform/shared/scripts/server.sh
index 7a960464d..7fd6c7e66 100644
--- a/terraform/shared/scripts/server.sh
+++ b/terraform/shared/scripts/server.sh
@@ -8,7 +8,10 @@ HADOOP_VERSION=hadoop-2.7.3
 HADOOPCONFIGDIR=/usr/local/$HADOOP_VERSION/etc/hadoop
 HOME_DIR=ubuntu
 
+sleep 15
+
 IP_ADDRESS=$(curl http://instance-data/latest/meta-data/local-ipv4)
+DOCKER_BRIDGE_IP_ADDRESS=(`ifconfig docker0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'`)
 SERVER_COUNT=$1
 REGION=$2
 CLUSTER_TAG_VALUE=$3
@@ -43,6 +46,16 @@ sudo service nomad start
 sleep 10
 export NOMAD_ADDR=http://$IP_ADDRESS:4646
 
+# Add hostname to /etc/hosts
+
+echo "127.0.0.1 $(hostname)" | sudo tee --append /etc/hosts
+
+# Add Docker bridge network IP to /etc/resolv.conf (at the top)
+
+echo "nameserver $DOCKER_BRIDGE_IP_ADDRESS" | sudo tee /etc/resolv.conf.new
+cat /etc/resolv.conf | sudo tee --append /etc/resolv.conf.new
+sudo mv /etc/resolv.conf.new /etc/resolv.conf
+
 # Hadoop
 sudo cp $CONFIGDIR/core-site.xml $HADOOPCONFIGDIR