Refactor to individual files. Make independent of other AWS infra.

Author: topfunky

main.tf

@@ -2,36 +2,6 @@ terraform {
   required_version = ">= 0.11.0"
 }
 
-variable "access_key" {
-  description = "The AWS access key used to provision resources"
-}
-
-variable "secret_key" {
-  description = "The AWS secret key used to provision resources"
-}
-
-variable "security_group_id" {
-  description = "The security group with ingress and egress rules that EC2 instances will be created within."
-}
-
-variable "region" {
-  description = "The AWS region in which to provision resources"
-  default     = "us-west-2"
-}
-
-variable "identity" {
-  description = "A unique name for your resources"
-}
-
-variable "ami" {
-  description = "The Amazon Machine Image for new instances."
-}
-
-variable "num_webs" {
-  description = "The number of servers to run"
-  default     = "1"
-}
-
 provider "aws" {
   version    = "~> 1.5"
   access_key = "${var.access_key}"
@@ -42,16 +12,10 @@ provider "aws" {
 module "server" {
   source = "./server"
 
-  num_webs          = "${var.num_webs}"
-  identity          = "${var.identity}"
-  security_group_id = "${var.security_group_id}"
-  ami               = "${var.ami}"
-}
-
-output "public_ip" {
-  value = "${module.server.public_ip}"
-}
-
-output "public_dns" {
-  value = "${module.server.public_dns}"
+  num_webs         = "${var.num_webs}"
+  identity         = "${var.identity}"
+  ami              = "${var.ami}"
+  ingress_cidr     = "${var.ingress_cidr}"
+  public_key_path  = "${var.public_key_path}"
+  private_key_path = "${var.private_key_path}"
 }

outputs.tf

@@ -0,0 +1,8 @@
+
+output "public_ip" {
+  value = "${module.server.public_ip}"
+}
+
+output "public_dns" {
+  value = "${module.server.public_dns}"
+}

server/main.tf

@@ -1,39 +1,66 @@
-variable "ami" {
-  description = "Base machine image for running this server"
-  default     = "ami-e70db29f"
+resource "aws_key_pair" "default" {
+  key_name   = "${var.identity}-key"
+  public_key = "${file("${var.public_key_path}")}"
 }
 
-variable "num_webs" {
-  description = "The number of servers to create"
-  default     = 1
-}
+resource "aws_security_group" "default" {
+  name_prefix = "${var.identity}"
 
-variable "identity" {
-  description = "A unique name for this server"
-}
+  ingress {
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = ["${var.ingress_cidr}"]
+  }
+
+  ingress {
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["${var.ingress_cidr}"]
+  }
 
-variable "security_group_id" {
-  description = "The AWS security group with ingress and egress rules for this instance."
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  tags {
+    "Created-by" = "Terraform"
+    "Identity"   = "${var.identity}"
+  }
 }
 
 resource "aws_instance" "web" {
   ami           = "${var.ami}"
   instance_type = "t2.medium"
   count         = "${var.num_webs}"
 
-  vpc_security_group_ids = ["${var.security_group_id}"]
+  vpc_security_group_ids = ["${aws_security_group.default.id}"]
+
+  key_name = "${aws_key_pair.default.id}"
 
   tags {
     "Name"       = "${var.identity} web ${count.index+1}/${var.num_webs}"
     "Identity"   = "${var.identity}"
     "Created-by" = "Terraform"
   }
-}
 
-output "public_ip" {
-  value = ["${aws_instance.web.*.public_ip}"]
-}
+  connection {
+    user        = "ubuntu"
+    private_key = "${file("${var.private_key_path}")}"
+  }
+
+  provisioner "file" {
+    source      = "assets"
+    destination = "/tmp/"
+  }
 
-output "public_dns" {
-  value = ["${aws_instance.web.*.public_dns}"]
+  provisioner "remote-exec" {
+    inline = [
+      "sudo sh /tmp/assets/setup-web.sh",
+    ]
+  }
 }

server/outputs.tf

@@ -0,0 +1,8 @@
+
+output "public_ip" {
+  value = ["${aws_instance.web.*.public_ip}"]
+}
+
+output "public_dns" {
+  value = ["${aws_instance.web.*.public_dns}"]
+}

server/variables.tf

@@ -0,0 +1,26 @@
+
+variable "ami" {
+  description = "Base machine image for running this server"
+}
+
+variable "num_webs" {
+  description = "The number of servers to create"
+  default     = 1
+}
+
+variable "identity" {
+  description = "A unique name for this server"
+}
+
+variable "ingress_cidr" {
+  description = "IP address block from which connections to this instance will be made"
+}
+
+variable "public_key_path" {
+  description = "Path on disk to the public key used to connect to this instance"
+}
+
+variable "private_key_path" {
+  description = "Path on disk to the private key used to connect to this instance"
+}
+

terraform.tfvars.example

@@ -0,0 +1,5 @@
+access_key=""
+secret_key=""
+identity="demo-wallaby"
+region="us-west-2"
+ingress_cidr="0.0.0.0/0"

variables.tf

@@ -0,0 +1,42 @@
+
+variable "access_key" {
+  description = "The AWS access key used to provision resources"
+}
+
+variable "secret_key" {
+  description = "The AWS secret key used to provision resources"
+}
+
+variable "region" {
+  description = "The AWS region in which to provision resources"
+  default     = "us-west-2"
+}
+
+variable "identity" {
+  description = "A unique name for your resources"
+}
+
+variable "ami" {
+  description = "The Amazon Machine Image for new instances."
+  default     = "ami-c62eaabe"
+}
+
+variable "ingress_cidr" {
+  default     = "0.0.0.0/0"
+  description = "IP block from which connections to this instance will be made"
+}
+
+variable "public_key_path" {
+  description = "Path on disk to the public key used to connect to this instance"
+  default     = "~/.ssh/id_rsa.pub"
+}
+
+variable "private_key_path" {
+  description = "Path on disk to the private key used to connect to this instance"
+  default     = "~/.ssh/id_rsa"
+}
+
+variable "num_webs" {
+  description = "The number of servers to run"
+  default     = "1"
+}