farcasclaudiu/terraform-course
1
0
Fork 0
mirror of https://github.com/farcasclaudiu/terraform-course.git synced 2026-06-29 09:02:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:wardviaene/terraform-course

Browse Source
This commit is contained in:
Edward Viaene
2018-07-31 18:15:09 +00:00
parent b80ec258ad 3307e2c120
commit d498d1edd0
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-demo-3/scripts/jenkins-init.sh
+5 -3
View File
@@ -45,9 +45,11 @@ rm -f get-pip.py
pip install awscli
# install terraform
cd /usr/local/bin
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
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
# clean up
apt-get clean
rm terraform_0.7.7_linux_amd64.zip
jenkins-packer-demo/output.tf
+2 -2
View File
@@ -1,6 +1,6 @@
output "jenkins-ip" {
value = "${aws_instance.jenkins-instance.*.public_ip}"
value = ["${aws_instance.jenkins-instance.*.public_ip}"]
}
output "app-ip" {
value = "${aws_instance.app-instance.*.public_ip}"
value = ["${aws_instance.app-instance.*.public_ip}"]
}
jenkins-packer-demo/scripts/jenkins-init.sh
+6 -3
View File
@@ -39,10 +39,13 @@ rm -f get-pip.py
pip install awscli
# install terraform
cd /usr/local/bin
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
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
# install packer
cd /usr/local/bin
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