Merge pull request #5702 from ministryofjustice/feature/DSOS-2721/ips

DSOS-2721-ips
ministryofjustice · Apr 15, 2024 · 6ce8e77 · 6ce8e77
2 parents 11a111b + fa4cd84
commit 6ce8e77
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git a/terraform/environments/nomis-combined-reporting/locals_etl.tf b/terraform/environments/nomis-combined-reporting/locals_etl.tf
@@ -35,9 +35,10 @@ locals {
     user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_and_ansible
 
     ebs_volumes = {
-      "/dev/sdb" = { type = "gp3", size = 100 }
-      "/dev/sdc" = { type = "gp3", size = 100 }
-      "/dev/sds" = { type = "gp3", size = 100 }
+      "/dev/sda1" = { type = "gp3", size = 100 }
+      "/dev/sdb"  = { type = "gp3", size = 100 }
+      "/dev/sdc"  = { type = "gp3", size = 100 }
+      "/dev/sds"  = { type = "gp3", size = 100 }
     }
 
     route53_records = module.baseline_presets.ec2_instance.route53_records.internal_and_external

diff --git a/terraform/environments/nomis-combined-reporting/locals_test.tf b/terraform/environments/nomis-combined-reporting/locals_test.tf
@@ -148,19 +148,19 @@ locals {
           instance-scheduling                  = "skip-scheduling"
         })
       })
-      # t1-ncr-etl-1-a = merge(local.etl_ec2_default, {
-      #   cloudwatch_metric_alarms = local.etl_cloudwatch_metric_alarms
-      #   config = merge(local.etl_ec2_default.config, {
-      #     instance_profile_policies = concat(local.etl_ec2_default.config.instance_profile_policies, [
-      #       "Ec2T1ReportingPolicy",
-      #     ])
-      #   })
-      #   tags = merge(local.etl_ec2_default.tags, {
-      #     description                          = "For testing SAP BI Platform ETL installation and configurations"
-      #     nomis-combined-reporting-environment = "t1"
-      #     instance-scheduling                  = "skip-scheduling"
-      #   })
-      # })
+      t1-ncr-etl-1-a = merge(local.etl_ec2_default, {
+        cloudwatch_metric_alarms = local.etl_cloudwatch_metric_alarms
+        config = merge(local.etl_ec2_default.config, {
+          instance_profile_policies = concat(local.etl_ec2_default.config.instance_profile_policies, [
+            "Ec2T1ReportingPolicy",
+          ])
+        })
+        tags = merge(local.etl_ec2_default.tags, {
+          description                          = "For testing SAP BI Platform ETL installation and configurations"
+          nomis-combined-reporting-environment = "t1"
+          instance-scheduling                  = "skip-scheduling"
+        })
+      })
     }
     baseline_lbs = {
       private = {
@@ -260,15 +260,9 @@ locals {
     baseline_route53_zones = {
       "test.reporting.nomis.service.justice.gov.uk" = {
         records = [
-          { name = "t1-ncr", type = "CNAME", ttl = "300", records = ["t1ncr-a.test.reporting.nomis.service.justice.gov.uk"] },
-          { name = "t1-ncr-a", type = "CNAME", ttl = "300", records = ["t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] },
-          { name = "t1-ncr-b", type = "CNAME", ttl = "300", records = ["t1-ncr-db-1-b.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] },
-          { name = "cmc-t1", type = "CNAME", ttl = "300", records = ["t1-ncr-web-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] },
-        ]
-        lb_alias_records = [
-          # T1
-          { name = "t1-ncr-cms", type = "A", lbs_map_key = "private" },
-          { name = "t1-ncr-web", type = "A", lbs_map_key = "private" },
+          { name = "db", type = "CNAME", ttl = "3600", records = ["t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] },
+          { name = "web", type = "CNAME", ttl = "3600", records = ["t1-ncr-web-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] },
+          { name = "etl", type = "CNAME", ttl = "3600", records = ["t1-ncr-etl-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk"] }
         ]
       }
     }