From 55b8be8dc311dc0c2e1ca818f4edd812da82e86c Mon Sep 17 00:00:00 2001 From: Edward Viaene Date: Wed, 19 Oct 2016 15:33:30 +0000 Subject: [PATCH] changes --- jenkins-packer-demo/s3.tf | 8 ++++++++ jenkins-packer-demo/scripts/configure-remote-state.sh | 2 ++ jenkins-packer-demo/scripts/jenkins-init.sh | 2 +- jenkins-packer-demo/vars.tf | 3 --- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 jenkins-packer-demo/s3.tf create mode 100755 jenkins-packer-demo/scripts/configure-remote-state.sh diff --git a/jenkins-packer-demo/s3.tf b/jenkins-packer-demo/s3.tf new file mode 100644 index 0000000..a24b989 --- /dev/null +++ b/jenkins-packer-demo/s3.tf @@ -0,0 +1,8 @@ +resource "aws_s3_bucket" "terraform-state" { + bucket = "terraform-state-a2b621f" + acl = "private" + + tags { + Name = "Terraform state" + } +} diff --git a/jenkins-packer-demo/scripts/configure-remote-state.sh b/jenkins-packer-demo/scripts/configure-remote-state.sh new file mode 100755 index 0000000..3b4aa20 --- /dev/null +++ b/jenkins-packer-demo/scripts/configure-remote-state.sh @@ -0,0 +1,2 @@ +#!/bin/sh +terraform remote config -backend=s3 -backend-config="bucket=terraform-state-a2b621f" -backend-config="key=terraform/terraform.tfstate" -backend-config="region=eu-west-1" diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh index f874d89..98e64a7 100644 --- a/jenkins-packer-demo/scripts/jenkins-init.sh +++ b/jenkins-packer-demo/scripts/jenkins-init.sh @@ -18,7 +18,7 @@ mount /var/lib/jenkins wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo apt-key add - echo "deb http://pkg.jenkins.io/debian-stable binary/" >> /etc/apt/sources.list apt-get update -apt-get install -y jenkins=${JENKINS_VERSION} +apt-get install -y jenkins=${JENKINS_VERSION} unzip # install pip wget -q https://bootstrap.pypa.io/get-pip.py diff --git a/jenkins-packer-demo/vars.tf b/jenkins-packer-demo/vars.tf index 5599f15..19c01f8 100644 --- a/jenkins-packer-demo/vars.tf +++ b/jenkins-packer-demo/vars.tf @@ -22,9 +22,6 @@ variable "JENKINS_VERSION" { default = "2.19.1" } -variable "APP_INSTANCE_AMI" { - default = "ami-2291de51" -} variable "APP_INSTANCE_COUNT" { default = "0" }