Skip to content

Commit

Permalink
Nomis: DSOS-2667: update syscon env (#5490)
Browse files Browse the repository at this point in the history 
* update syscon env

* rebuild weblogic with new tag

* update instance scheduling
  • Loading branch information
@drobinson-moj
drobinson-moj authored Mar 26, 2024
1 parent 57c0aaa commit 24ab8ac
Showing 1 changed file with 12 additions and 23 deletions.
35 changes: 12 additions & 23 deletions terraform/environments/nomis/locals_development.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
})
Expand Down Expand Up @@ -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"
})
Expand Down Expand Up @@ -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"
})
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 24ab8ac

Please sign in to comment.