terraform version fix

hatan4ik · Aug 2, 2018 · 24083ff · 24083ff
1 parent c8d558d
commit 24083ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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"