Regenerate with several fixes and cleanup

cwonrails · Jan 5, 2017 · 99be177 · 99be177
1 parent e77b8f9
commit 99be177
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 102 deletions.
diff --git a/code/bash/01-why-terraform/setup-webserver.sh b/code/bash/01-why-terraform/setup-webserver.sh
@@ -12,7 +12,7 @@ sudo apt-get install -y php
 # Install Apache
 sudo apt-get install -y apache2
 
-# Copy the code from repository
+# Copy the code from the repository
 sudo git clone https://github.com/brikis98/php-app.git /var/www/html/app
 
 # Start Apache

diff --git a/code/terraform/01-why-terraform/server-db-elb/README.md b/code/terraform/01-why-terraform/server-db-elb/README.md
diff --git a/code/terraform/01-why-terraform/server-db-elb/main.tf b/code/terraform/01-why-terraform/server-db-elb/main.tf
diff --git a/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/main.tf b/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/main.tf
@@ -11,7 +11,7 @@ resource "aws_instance" "example" {
   instance_type          = "t2.micro"
   vpc_security_group_ids = ["${aws_security_group.instance.id}"]
 
-  user_data = <<EOF
+  user_data = <<-EOF
               #!/bin/bash
               echo "Hello, World" > index.html
               nohup busybox httpd -f -p "${var.server_port}" &

diff --git a/...form/04-terraform-module/multi-repo-example/live/stage/services/webserver-cluster/main.tf b/...form/04-terraform-module/multi-repo-example/live/stage/services/webserver-cluster/main.tf
@@ -7,7 +7,7 @@ provider "aws" {
 }
 
 module "webserver_cluster" {
-  source = "[email protected]:brikis98/terraform-up-and-running-code.git//code/terraform/04-terraform-module/module-example/modules/services/webserver-cluster?ref=v0.0.1"
+  source = "[email protected]:brikis98/terraform-up-and-running-code.git//code/terraform/04-terraform-module/module-example/modules/services/webserver-cluster?ref=v0.0.2"
 
   cluster_name           = "webservers-stage"
   db_remote_state_bucket = "${var.db_remote_state_bucket}"

diff --git a/...ips-and-tricks/loops-and-if-statements/live/stage/services/multiple-ec2-instances/main.tf b/...ips-and-tricks/loops-and-if-statements/live/stage/services/multiple-ec2-instances/main.tf
@@ -8,12 +8,6 @@ provider "aws" {
 
 data "aws_availability_zones" "all" {}
 
-resource "aws_instance" "example" {
-  count         = 3
-  ami           = "ami-40d28157"
-  instance_type = "t2.micro"
-}
-
 resource "aws_instance" "example" {
   count             = "${var.num_availability_zones}"
   availability_zone = "${element(data.aws_availability_zones.all.names, count.index)}"

diff --git a/...orm/05-tips-and-tricks/loops-and-if-statements/modules/services/webserver-cluster/main.tf b/...orm/05-tips-and-tricks/loops-and-if-statements/modules/services/webserver-cluster/main.tf
@@ -7,9 +7,10 @@ resource "aws_launch_configuration" "example" {
   instance_type   = "${var.instance_type}"
   security_groups = ["${aws_security_group.instance.id}"]
 
-  user_data = "${var.enable_new_user_data ?
-      data.template_file.user_data_new.0.rendered :
-      data.template_file.user_data.0.rendered}"
+  user_data = "${element(
+      concat(data.template_file.user_data.*.rendered,
+             data.template_file.user_data_new.*.rendered),
+      0)}"
 
   lifecycle {
     create_before_destroy = true

diff --git a/...rm/05-tips-and-tricks/zero-downtime-deployment/modules/services/webserver-cluster/main.tf b/...rm/05-tips-and-tricks/zero-downtime-deployment/modules/services/webserver-cluster/main.tf
@@ -26,7 +26,8 @@ data "template_file" "user_data" {
 }
 
 resource "aws_autoscaling_group" "example" {
-  name                 = "${var.cluster_name}-${aws_launch_configuration.example.name}"
+  name = "${var.cluster_name}-${aws_launch_configuration.example.name}"
+
   launch_configuration = "${aws_launch_configuration.example.id}"
   availability_zones   = ["${data.aws_availability_zones.all.names}"]
   load_balancers       = ["${aws_elb.example.name}"]