Merge branch 'master' of github.com:aknuds1/tectonic-installer into d…

…igitalocean
coreos · Aug 13, 2017 · 55ac711 · 55ac711
2 parents 6ea0d42 + f21b9a1
commit 55ac711
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@ build/
 bin/
 modules/update-payload/generated/
 # Allow for user configuration
-custom.tf
+custom.tf
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ INSTALLER_BIN = $(TOP_DIR)/installer/bin/$(shell uname | tr '[:upper:]' '[:lower
 TF_DOCS := $(shell which terraform-docs 2> /dev/null)
 TF_EXAMPLES := $(shell which terraform-examples 2> /dev/null)
 TF_RC := $(TOP_DIR)/.terraformrc
-TF_CMD = TERRAFORM_CONFIG=$(TF_RC) terraform
+export TF_VAR_tectonic_cluster_name = $(CLUSTER)
 
 $(info Using build directory [${BUILD_DIR}])
 
@@ -132,7 +132,6 @@ structure-check:
 
 	@if $(MAKE) docs && ! git diff --exit-code; then echo "outdated docs (run 'make docs' to fix)"; exit 1; fi
 	@if $(MAKE) examples && ! git diff --exit-code; then echo "outdated examples (run 'make examples' to fix)"; exit 1; fi
-	@if $(TOP_DIR)/modules/update-payload/make-update-payload.sh && ! git diff --exit-code; then echo "outdated payload (run '$(TOP_DIR)/modules/update-payload/make-update-payload.sh' to fix)"; exit 1; fi
 
 SMOKE_SOURCES := $(shell find $(TOP_DIR)/tests/smoke -name '*.go')
 .PHONY: bin/smoke