NRL-1385 Point EC2 at custom AMI

Author: jackleary

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

@@ -8,38 +8,9 @@ module "vpc" {
   name_prefix                    = "nhsd-nrlf--dev"
 }
 
-module "ec2" {
-  source             = "../modules/ec2"
-  use_custom_ami     = true
-  instance_type      = var.instance_type
-  name_prefix        = "nhsd-nrlf--dev"
-  target_bucket_arn  = module.dev-glue.target_bucket_arn
-  glue_kms_key_arn   = module.dev-glue.aws_kms_key_arn
-  athena_kms_key_arn = module.dev-athena.kms_key_arn
-  athena_bucket_arn  = module.dev-athena.bucket_arn
-
-
-  subnet_id       = module.vpc.subnet_id
-  security_groups = module.vpc.security_group
-}
-
-module "powerbi_gw_instance" {
-  source             = "../modules/ec2"
-  use_custom_ami     = true
-  instance_type      = var.instance_type
-  name_prefix        = "nhsd-nrlf--dev-powerbi-gw"
-  target_bucket_arn  = module.dev-glue.target_bucket_arn
-  glue_kms_key_arn   = module.dev-glue.aws_kms_key_arn
-  athena_kms_key_arn = module.dev-athena.kms_key_arn
-  athena_bucket_arn  = module.dev-athena.bucket_arn
-
-  subnet_id       = module.vpc.private_subnet_id
-  security_groups = [module.vpc.powerbi_gw_security_group_id]
-}
-
 module "powerbi_gw_instance_v2" {
   source             = "../modules/ec2"
-  use_custom_ami     = false
+  use_custom_ami     = true
   instance_type      = var.instance_type
   name_prefix        = "nhsd-nrlf--dev-powerbi-gw-v2"
   target_bucket_arn  = module.dev-glue.target_bucket_arn

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

@@ -12,6 +12,6 @@ data "aws_ami" "PowerBI_Gateway" {
   owners      = ["self"]
   filter {
     name   = "name"
-    values = ["PowerBI_Gateway"]
+    values = ["PowerBI_GW"]
   }
 }