Minor tweaks to starting modules for getting started demo

Author: FraserPol

self-serve-infrastructure/getting-started/terraform-aws/main.tf

@@ -1,61 +1,21 @@
-provider "aws" { }
-
-data "aws_vpc" "default" {
-  default = true
-}
-
-data "aws_subnet_ids" "all" {
-  vpc_id = "${data.aws_vpc.default.id}"
+provider "aws" {
+  region = "${var.region}"
 }
 
-data "aws_ami" "amazon_linux" {
-  most_recent = true
-
-  filter {
-    name = "name"
+resource "aws_vpc" "demo_vpc" {
+  cidr_block = "${var.vpc_cidr_block}"
 
-    values = [
-      "amzn-ami-hvm-*-x86_64-gp2",
-    ]
+  tags {
+    Name = "fp_demo_vpc"
   }
-
-  filter {
-    name = "owner-alias"
-
-    values = [
-      "amazon",
-    ]
-  }
-}
-
-module "security_group" {
-  source = "terraform-aws-modules/security-group/aws"
-
-  name        = "${var.name}"
-  description = "Security group for example usage with EC2 instance"
-  vpc_id      = "${data.aws_vpc.default.id}"
-
-  ingress_cidr_blocks = ["0.0.0.0/0"]
-  ingress_rules       = ["http-80-tcp", "all-icmp"]
-  egress_rules        = ["all-all"]
-
-  tags = "${var.tags}"
 }
 
-resource "aws_eip" "this" {
-  vpc      = true
-  instance = "${module.ec2.id[0]}"
-}
-
-module "ec2" {
-  source  = "terraform-aws-modules/ec2-instance/aws"
+resource "aws_subnet" "demo_subnet" {
+  vpc_id            = "${aws_vpc.demo_vpc.id}"
+  cidr_block        = "${var.subnet_cidr_block}"
+  availability_zone = "${var.subnet_availability_zone}"
 
-  name                        = "${var.name}"
-  ami                         = "${data.aws_ami.amazon_linux.id}"
-  instance_type               = "${var.instance_type}"
-  subnet_id                   = "${element(data.aws_subnet_ids.all.ids, 0)}"
-  vpc_security_group_ids      = ["${module.security_group.this_security_group_id}"]
-  associate_public_ip_address = true
-
-  tags = "${var.tags}"
+  tags {
+    Name = "fp_demo_subnet"
+  }
 }

self-serve-infrastructure/getting-started/terraform-aws/outputs.tf

@@ -1,19 +1,9 @@
-output "id" {
-  description = "List of IDs of instances"
-  value       = ["${module.ec2.id}"]
+output "vpc_id_consumable" {
+  value = "${aws_vpc.demo_vpc.id}"
+  description = "This is the VPC ID for later use"
 }
 
-output "public_dns" {
-  description = "List of public DNS names assigned to the instances"
-  value       = ["${module.ec2.public_dns}"]
-}
-
-output "instance_id" {
-  description = "EC2 instance ID"
-  value       = "${module.ec2.id[0]}"
-}
-
-output "instance_public_dns" {
-  description = "Public DNS name assigned to the EC2 instance"
-  value       = "${module.ec2.public_dns[0]}"
+output "demo_subnet_id" {
+  value = "${aws_subnet.demo_subnet.id}"
+  description = "This is the Subnet ID for later use"
 }

self-serve-infrastructure/getting-started/terraform-aws/variables.tf

@@ -1,20 +1,25 @@
-module "network" {
-  source              = "Azure/network/azurerm"
-  resource_group_name = "${var.name}"
-  location            = "${var.network_location}"
-  address_space       = "10.0.0.0/16"
-  subnet_prefixes     = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  subnet_names        = ["${var.name}-1", "${var.name}-2", "${var.name}-3"]
+provider "azurerm" {
+  subscription_id = ""
+  client_id       = ""
+  client_secret   = ""
+  tenant_id       = ""
+}
 
-  tags = "${merge(var.tags, map("Name", format("%s-%d", var.name, count.index+1)))}"
+resource "azurerm_resource_group" "demo_resource_group" {
+  name     = "${var.rg_name}"
+  location = "${var.rg_location}"
 }
 
-module "linuxservers" {
-  source              = "Azure/compute/azurerm"
-  location            = "${var.compute_location}"
-  vm_os_simple        = "UbuntuServer"
-  public_ip_dns       = ["${var.name}"] // change to a unique name per datacenter region
-  vnet_subnet_id      = "${module.network.vnet_subnets[0]}"
+resource "azurerm_virtual_network" "demo_virtual_network" {
+  name                = "${var.vn_name}"
+  address_space       = ["${var.vn_address_space}"]
+  location            = "${azurerm_resource_group.demo_resource_group.location}"
+  resource_group_name = "${azurerm_resource_group.demo_resource_group.name}"
+}
 
-  tags = "${merge(var.tags, map("Name", format("%s-%d", var.name, count.index+1)))}"
+resource "azurerm_subnet" "demo_subnet" {
+  name                 = "${var.sb_name}"
+  resource_group_name  = "${azurerm_resource_group.demo_virtual_network.name}"
+  virtual_network_name = "${azurerm_virtual_network.demo_virtual_network.name}"
+  address_prefix       = "${var.sb_address_prefix}"
 }

self-serve-infrastructure/getting-started/terraform-azure/main.tf

@@ -1,3 +1,19 @@
-output "linux_vm_public_name"{
-  value = "${module.linuxservers.public_ip_dns_name}"
+output "resource_group_consumable" {
+  value = "${azurerm_resource_group.demo_resource_group.name}"
+  description = "The Demo VPC Name for later use"
+}
+
+output "virtual_network_consumable_name" {
+  value = "${azurerm_virtual_network.demo_virtual_network.name}"
+  description = "The Demo Virtaul Network name for later use"
+}
+
+output "virtual_network_consumable_address_space" {
+  value = "${azurerm_virtual_network.demo_virtual_network.address_space}"
+  description = "The Demo Virtaul Network address space for later use"
+}
+
+output "subnet_consumable" {
+  value = "${azurerm_subnet.demo_subnet.address_prefix}"
+  description = "The Demo Subnet for later use"
 }