From 24ab8acd8a8e646b87c7dc330cad54991896159e Mon Sep 17 00:00:00 2001
From: Dominic Robinson <65237317+drobinson-moj@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:06:24 +0000
Subject: [PATCH] Nomis: DSOS-2667: update syscon env (#5490)

* update syscon env

* rebuild weblogic with new tag

* update instance scheduling
---
 .../environments/nomis/locals_development.tf  | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/terraform/environments/nomis/locals_development.tf b/terraform/environments/nomis/locals_development.tf
index 6ffc4648b40..1614ce17eca 100644
--- a/terraform/environments/nomis/locals_development.tf
+++ b/terraform/environments/nomis/locals_development.tf
@@ -274,12 +274,6 @@ locals {
 
     baseline_ec2_instances = {
 
-      # SDPDL0001 Standard DS12 v2 (4 vcpus, 28 GiB memory)  [18GiB free] [3 x 512] [r6i.xlarge 4/32]
-      # SDPWL0001 Standard D2 v2 (2 vcpus, 7 GiB memory) (RHEL6) [t2.large  2/8]
-      # SDPWL0002 Standard D2 v2 (2 vcpus, 7 GiB memory) (RHEL6) [t2.large]
-      # SDPWL0003 Standard D2 v2 (2 vcpus, 7 GiB memory) (RHEL6) [t2.large]
-      # SDPNL0001 Standard D2 v2 (2 vcpus, 7 GiB memory) (RHEL7) [t3.medium]
-
       dev-nomis-db-1-a = merge(local.database_ec2, {
         config = merge(local.database_ec2.config, {
           ami_name          = "nomis_rhel_7_9_oracledb_11_2_release_2023-07-02T00-00-39.521Z"
@@ -329,7 +323,7 @@ locals {
         tags = merge(local.weblogic_ec2.tags, {
           instance-scheduling  = "skip-scheduling"
           nomis-environment    = "dev"
-          oracle-db-hostname-a = "SDPDL0001.azure.noms.root"
+          oracle-db-hostname-a = "dev-nomis-db-1-a"
           oracle-db-hostname-b = "none"
           oracle-db-name       = "dev"
         })
@@ -358,7 +352,7 @@ locals {
         tags = merge(local.weblogic_ec2.tags, {
           instance-scheduling  = "skip-scheduling"
           nomis-environment    = "qa11g"
-          oracle-db-hostname-a = "SDPDL0001.azure.noms.root"
+          oracle-db-hostname-a = "dev-nomis-db-1-a"
           oracle-db-hostname-b = "none"
           oracle-db-name       = "qa11g"
         })
@@ -387,7 +381,7 @@ locals {
         tags = merge(local.weblogic_ec2.tags, {
           instance-scheduling  = "skip-scheduling"
           nomis-environment    = "qa11r"
-          oracle-db-hostname-a = "SDPDL0001.azure.noms.root"
+          oracle-db-hostname-a = "dev-nomis-db-1-a"
           oracle-db-hostname-b = "none"
           oracle-db-name       = "qa11r"
         })
@@ -421,11 +415,12 @@ locals {
           })
         })
         tags = {
-          description = "Syscon build and release server"
-          ami         = "base_rhel_7_9"
-          os-type     = "Linux"
-          component   = "build"
-          server-type = "nomis-build"
+          description         = "Syscon build and release server"
+          ami                 = "base_rhel_7_9"
+          instance-scheduling = "skip-scheduling"
+          os-type             = "Linux"
+          component           = "build"
+          server-type         = "nomis-build"
         }
       }
     }
@@ -526,15 +521,9 @@ locals {
       "development.nomis.service.justice.gov.uk" = {
         records = [
           # SYSCON
-          { name = "dev", type = "CNAME", ttl = "300", records = ["dev-a.development.nomis.service.justice.gov.uk"] },
-          { name = "dev-a", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
-          { name = "dev-b", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
-          { name = "qa11g", type = "CNAME", ttl = "300", records = ["qa11g-a.development.nomis.service.justice.gov.uk"] },
-          { name = "qa11g-a", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
-          { name = "qa11g-b", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
-          { name = "qa11r", type = "CNAME", ttl = "300", records = ["qa11r-a.development.nomis.service.justice.gov.uk"] },
-          { name = "qa11r-a", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
-          { name = "qa11r-b", type = "CNAME", ttl = "300", records = ["SDPDL0001.azure.noms.root"] },
+          { name = "dev", type = "CNAME", ttl = "300", records = ["dev-nomis-db-1-a.nomis.hmpps-development.modernisation-platform.service.justice.gov.uk"] },
+          { name = "qa11g", type = "CNAME", ttl = "300", records = ["dev-nomis-db-1-a.nomis.hmpps-development.modernisation-platform.service.justice.gov.uk"] },
+          { name = "qa11r", type = "CNAME", ttl = "300", records = ["dev-nomis-db-1-a.nomis.hmpps-development.modernisation-platform.service.justice.gov.uk"] },
         ]
         lb_alias_records = [
           # dev