Merge pull request coreos#123 from coreos/fixes

Assortment of fixes
alexsomesan · Mar 24, 2017 · 35a1efa · 35a1efa
2 parents 6170708 + 0932fcf
commit 35a1efa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/aws/etcd/ignition.tf b/modules/aws/etcd/ignition.tf
@@ -18,7 +18,7 @@ resource "ignition_file" "node_hostname" {
   filesystem = "root"
 
   content {
-    content = "{var.cluster_name}-etcd-${count.index}.${var.base_domain}"
+    content = "${var.cluster_name}-etcd-${count.index}.${var.base_domain}"
   }
 }
 
@@ -37,7 +37,7 @@ resource "ignition_systemd_unit" "locksmithd" {
 }
 
 resource "ignition_systemd_unit" "etcd3" {
-  count = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
+  count  = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
   name   = "etcd-member.service"
   enable = true
 

diff --git a/modules/aws/master-asg/elb.tf b/modules/aws/master-asg/elb.tf
@@ -22,7 +22,7 @@ resource "aws_elb" "api-internal" {
     healthy_threshold   = 2
     unhealthy_threshold = 2
     timeout             = 3
-    target              = "HTTP:10255/healthz"
+    target              = "TCP:443"
     interval            = 5
   }
 
@@ -68,7 +68,7 @@ resource "aws_elb" "api-external" {
     healthy_threshold   = 2
     unhealthy_threshold = 2
     timeout             = 3
-    target              = "TCP:22"
+    target              = "TCP:443"
     interval            = 5
   }
 

diff --git a/terraform.mk b/terraform.mk
@@ -10,7 +10,7 @@ TERRAFORM_GO_OS=linux darwin windows
 TERRAFORM_GOARCH=386 amd64
 
 PATH  := $(TOP_DIR)/bin/terraform:$(PATH)
-SHELL := env PATH=$(PATH) /bin/bash
+SHELL := env PATH="${PATH}" /bin/bash
 $(info Using TerraForm binary [$(shell which terraform 2> /dev/null)])
 
 ifeq ($(OS), Windows_NT)