Skip to content

Commit e86f3d5

Browse files
committed
Use terraform 0.11.13 and fix location
- Use TF_INSTALLATION_PREFIX in makefile - Ignore .cache/ (local version of TF_INSTALLATION_PREFIX) - Ignore config directories - Ignore bundle installation directories
1 parent 323f6be commit e86f3d5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ graph.png
1919
local-development-0/local-development-0.tfstate
2020
macstadium-*/config/
2121
tfstate
22+
.cache/
23+
config/
24+
.bundle/
25+
vendor/

terraform-common.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ AMQP_URL_ORG_VARNAME ?= AMQP_URL
1616
TOP := $(shell git rev-parse --show-toplevel)
1717
NATBZ2 := $(TOP)/assets/nat.tar.bz2
1818

19-
PROD_TF_VERSION := v0.11.10
20-
TERRAFORM := $(HOME)/.cache/travis-terraform-config/terraform-$(PROD_TF_VERSION)
19+
PROD_TF_VERSION := v0.11.13
20+
TERRAFORM := $(TF_INSTALLATION_PREFIX)/terraform-$(PROD_TF_VERSION)
2121

2222
export PROD_TF_VERSION
2323
export TERRAFORM

0 commit comments

Comments
 (0)