DSOS-2091: update weblogic deployments in T3 and preprod (#3109)

* t3 weblogic-b test * DSOS-2091: add preprod config
ministryofjustice · Aug 16, 2023 · 0620f30 · 0620f30
1 parent 2a0c7a6
commit 0620f30
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/terraform/environments/nomis/locals_preproduction.tf b/terraform/environments/nomis/locals_preproduction.tf
@@ -45,12 +45,18 @@ locals {
 
       # green deployment
       preprod-nomis-web-b = merge(local.weblogic_ec2_b, {
+        instance = merge(local.weblogic_ec2_b.instance, {
+          instance_type = "t2.xlarge"
+        })
         tags = merge(local.weblogic_ec2_b.tags, {
           nomis-environment    = "preprod"
           oracle-db-hostname-a = "ppnomis-a.preproduction.nomis.service.justice.gov.uk"
           oracle-db-hostname-b = "ppnomis-b.preproduction.nomis.service.justice.gov.uk"
           oracle-db-name       = "PPCNOM"
         })
+        autoscaling_group = merge(local.weblogic_ec2_b.autoscaling_group, {
+          desired_capacity = 2
+        })
       })
     }
 

diff --git a/terraform/environments/nomis/locals_test.tf b/terraform/environments/nomis/locals_test.tf
@@ -164,14 +164,17 @@ locals {
 
       # green deployment
       t3-nomis-web-b = merge(local.weblogic_ec2_b, {
+        instance = merge(local.weblogic_ec2_b.instance, {
+          instance_type = "t2.xlarge"
+        })
         tags = merge(local.weblogic_ec2_b.tags, {
           nomis-environment    = "t3"
           oracle-db-hostname-a = "t3nomis-a.test.nomis.service.justice.gov.uk"
           oracle-db-hostname-b = "t3nomis-b.test.nomis.service.justice.gov.uk"
           oracle-db-name       = "T3CNOM"
         })
         autoscaling_group = merge(local.weblogic_ec2_b.autoscaling_group, {
-          desired_capacity = 0
+          desired_capacity = 1
         })
       })
 

diff --git a/terraform/environments/nomis/locals_weblogic.tf b/terraform/environments/nomis/locals_weblogic.tf
@@ -182,7 +182,7 @@ locals {
     })
     user_data_cloud_init = merge(local.weblogic_ec2_default.user_data_cloud_init, {
       args = merge(local.weblogic_ec2_default.user_data_cloud_init.args, {
-        branch = "main"
+        branch = "f855376d147bf6d0f2e035150585cd7de50f6d67" # 2023-08-15 weblogic deployments
       })
     })
     # autoscaling_group = merge(local.weblogic_ec2_default.autoscaling_group, {})