From 584632128ff6b4e7ae3c4bc6c563e5257b60b6ca Mon Sep 17 00:00:00 2001 From: Edward Viaene Date: Wed, 19 Oct 2016 15:54:06 +0000 Subject: [PATCH] changes --- jenkins-packer-demo/amivar.tf | 1 + jenkins-packer-demo/key.tf | 3 +++ jenkins-packer-demo/scripts/jenkins-init.sh | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 jenkins-packer-demo/amivar.tf diff --git a/jenkins-packer-demo/amivar.tf b/jenkins-packer-demo/amivar.tf new file mode 100644 index 0000000..3503935 --- /dev/null +++ b/jenkins-packer-demo/amivar.tf @@ -0,0 +1 @@ +variable "APP_INSTANCE_AMI" { default = "" } diff --git a/jenkins-packer-demo/key.tf b/jenkins-packer-demo/key.tf index 0d3c220..278a5a9 100644 --- a/jenkins-packer-demo/key.tf +++ b/jenkins-packer-demo/key.tf @@ -1,4 +1,7 @@ resource "aws_key_pair" "mykeypair" { key_name = "mykeypair" public_key = "${file("${var.PATH_TO_PUBLIC_KEY}")}" + lifecycle { + ignore_changes = ["public_key"] + } } diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh index 98e64a7..976a1dc 100644 --- a/jenkins-packer-demo/scripts/jenkins-init.sh +++ b/jenkins-packer-demo/scripts/jenkins-init.sh @@ -30,12 +30,12 @@ pip install awscli # install terraform cd /usr/local/bin -wget -q https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip -unzip terraform_0.7.4_linux_amd64.zip +wget -q https://releases.hashicorp.com/terraform/0.7.7/terraform_0.7.7_linux_amd64.zip +unzip terraform_0.7.7_linux_amd64.zip # install packer wget -q https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.zip unzip packer_0.10.2_linux_amd64.zip # clean up apt-get clean -rm terraform_0.7.4_linux_amd64.zip +rm terraform_0.7.7_linux_amd64.zip rm packer_0.10.2_linux_amd64.zip