Merge pull request #36 from brikis98/2nd-edition

2nd edition

Author: brikis98

README.md

@@ -5,6 +5,10 @@ This repo contains the code samples for the book *[Terraform: Up and Running](ht
 
 
 
+## IMPORTANT NOTE ON 2ND EDITION
+
+The 2nd edition of *Terraform: Up & Running* will be available shortly! If you're reading an early copy of the new edition of the book, please head over to the [2nd-edition branch](https://github.com/brikis98/terraform-up-and-running-code/tree/2nd-edition), which has all the code updated to Terraform 0.12, tons of new code for the new chapters in the book, and so on. It's a work in progress, so think of this branch as a preview of what things will look like when all the updates are finished.
+
 
 ## IMPORTANT NOTE ON 2ND EDITION
 

code/ansible/01-why-terraform/hosts

@@ -0,0 +1,6 @@
+[webservers]
+11.11.11.11
+11.11.11.12
+11.11.11.13
+11.11.11.14
+11.11.11.15

code/ansible/01-why-terraform/playbook.yml

@@ -0,0 +1,3 @@
+- hosts: webservers
+  roles:
+  - webserver

code/ansible/01-why-terraform/procedural-examples.yml

@@ -0,0 +1,9 @@
+- ec2:
+    count: 10
+    image: ami-0c55b159cbfafe1f0
+    instance_type: t2.micro
+
+- ec2:
+    count: 5
+    image: ami-0c55b159cbfafe1f0
+    instance_type: t2.micro

code/ansible/01-why-terraform/webserver.yml

@@ -0,0 +1,17 @@
+- name: Update the apt-get cache
+  apt:
+    update_cache: yes
+
+- name: Install PHP
+  apt:
+    name: php
+
+- name: Install Apache
+  apt:
+    name: apache2
+
+- name: Copy the code from the repository
+  git: repo=https://github.com/brikis98/php-app.git dest=/var/www/html/app
+
+- name: Start Apache
+  service: name=apache2 state=started enabled=yes

code/bash/01-why-terraform/setup-webserver.sh

@@ -6,11 +6,8 @@ set -e
 # Update the apt-get cache
 sudo apt-get update
 
-# Install PHP
-sudo apt-get install -y php
-
-# Install Apache
-sudo apt-get install -y apache2
+# Install PHP and Apache
+sudo apt-get install -y php apache2
 
 # Copy the code from the repository
 sudo git clone https://github.com/brikis98/php-app.git /var/www/html/app

code/bash/03-terraform-state/user-data.sh

@@ -6,4 +6,4 @@ cat > index.html <<EOF
 <p>DB port: ${db_port}</p>
 EOF
 
-nohup busybox httpd -f -p "${server_port}" &
+nohup busybox httpd -f -p ${server_port} &

code/packer/01-why-terraform/webserver.json

@@ -2,18 +2,20 @@
   "builders": [{
     "ami_name": "packer-example",
     "instance_type": "t2.micro",
-    "region": "us-east-1",
+    "region": "us-east-2",
     "type": "amazon-ebs",
-    "source_ami": "ami-40d28157",
+    "source_ami": "ami-0c55b159cbfafe1f0",
     "ssh_username": "ubuntu"
   }],
   "provisioners": [{
     "type": "shell",
     "inline": [
       "sudo apt-get update",
-      "sudo apt-get install -y php",
-      "sudo apt-get install -y apache2",
+      "sudo apt-get install -y php apache2",
       "sudo git clone https://github.com/brikis98/php-app.git /var/www/html/app"
+    ],
+    "environment_vars": [
+      "DEBIAN_FRONTEND=noninteractive"
     ]
   }]
 }

code/ruby/04-terraform-modules/function-example.rb

@@ -0,0 +1,6 @@
+def example_function()
+  puts "Hello, World"
+end
+
+# Other places in your code
+example_function()

code/ruby/04-terraform-modules/function-with-input-and-output-params-example.rb

@@ -0,0 +1,6 @@
+def example_function(param1, param2)
+  return "Hello, #{param1} #{param2}"
+end
+
+# Other places in your code
+return_value = example_function("foo", "bar")