NRL-1385 syntax fixes

Author: jackleary

terraform/account-wide-infrastructure/dev/ec2.tf

@@ -1,6 +1,5 @@
 module "vpc" {
   source                        = "../modules/vpc"
-  aws_region                    = var.aws_region
   vpc_cidr_block                = var.vpc_cidr_block
   enable_dns_hostnames          = var.enable_dns_hostnames
   vpc_public_subnets_cidr_block = var.vpc_public_subnets_cidr_block

terraform/account-wide-infrastructure/dev/vars.tf

@@ -17,7 +17,7 @@ variable "devsandbox_api_domain_name" {
 variable "aws_azs" {
   type        = string
   description = "AWS Availability Zones"
-  default     = "eu-west-1a"
+  default     = "eu-west-2a"
 }
 
 variable "enable_dns_hostnames" {
@@ -45,5 +45,5 @@ variable "instance_type" {
 }
 
 variable "instance_key" {
-  default = "WorkshopKeyPair"
+  default = "PowerBIGateway"
 }

terraform/account-wide-infrastructure/modules/ec2/ec2.tf

@@ -6,10 +6,10 @@ resource "aws_instance" "web" {
   subnet_id       = var.subnet_id
   security_groups = var.security_groups
 
-  user_data = file("./modules/web/userdata.tpl")
+  user_data = file("${path.module}/scripts/user_data.tpl")
 
   tags = {
-    Name = "${var.naming_prefix}-ec2"
+    Name = "${var.name_prefix}-ec2"
   }
 
 }

terraform/account-wide-infrastructure/modules/ec2/vars.tf

@@ -2,7 +2,6 @@ variable "name_prefix" {
   type        = string
   description = "The prefix to apply to all resources in the module."
 }
-variable "common_tags" {}
 variable "instance_type" {}
 variable "instance_key" {}
 variable "security_groups" {}

terraform/account-wide-infrastructure/modules/vpc/vars.tf

@@ -1,7 +1,5 @@
-variable "aws_region" {}
 variable "aws_azs" {}
 variable "enable_dns_hostnames" {}
 variable "vpc_cidr_block" {}
 variable "vpc_public_subnets_cidr_block" {}
-variable "common_tags" {}
 variable "name_prefix" {}