From 24083ff04a77c15d4effcb8f1ab001f55c8b6a26 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward.viaene@gmail.com>
Date: Thu, 2 Aug 2018 19:11:12 +0000
Subject: [PATCH] terraform version fix

---
 jenkins-packer-demo/cloudinit.tf            | 1 +
 jenkins-packer-demo/scripts/jenkins-init.sh | 1 -
 jenkins-packer-demo/vars.tf                 | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jenkins-packer-demo/cloudinit.tf b/jenkins-packer-demo/cloudinit.tf
index 82162b5..f6cdfec 100644
--- a/jenkins-packer-demo/cloudinit.tf
+++ b/jenkins-packer-demo/cloudinit.tf
@@ -3,6 +3,7 @@ data "template_file" "jenkins-init" {
   vars {
     DEVICE = "${var.INSTANCE_DEVICE_NAME}"
     JENKINS_VERSION = "${var.JENKINS_VERSION}"
+    TERRAFORM_VERSION = "${var.TERRAFORM_VERSION}"
   }
 }
 data "template_cloudinit_config" "cloudinit-jenkins" {
diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh
index 91767f6..d8ca327 100644
--- a/jenkins-packer-demo/scripts/jenkins-init.sh
+++ b/jenkins-packer-demo/scripts/jenkins-init.sh
@@ -39,7 +39,6 @@ rm -f get-pip.py
 pip install awscli
 
 # install terraform
-TERRAFORM_VERSION="0.11.7"
 wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
 && unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \
 && rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
diff --git a/jenkins-packer-demo/vars.tf b/jenkins-packer-demo/vars.tf
index b338aa2..712aaae 100644
--- a/jenkins-packer-demo/vars.tf
+++ b/jenkins-packer-demo/vars.tf
@@ -21,6 +21,9 @@ variable "INSTANCE_DEVICE_NAME" {
 variable "JENKINS_VERSION" {
   default = "2.32.1"
 }
+variable "TERRAFORM_VERSION" {
+  default = "0.11.7"
+}
 
 variable "APP_INSTANCE_COUNT" {
   default = "0"