From 0620f30f8dc0cedeb0db5173fb3a2d3f1ecbfb7d Mon Sep 17 00:00:00 2001
From: Dominic Robinson <65237317+drobinson-moj@users.noreply.github.com>
Date: Wed, 16 Aug 2023 16:18:59 +0100
Subject: [PATCH] DSOS-2091: update weblogic deployments in T3 and preprod
 (#3109)

* t3 weblogic-b test

* DSOS-2091: add preprod config
---
 terraform/environments/nomis/locals_preproduction.tf | 6 ++++++
 terraform/environments/nomis/locals_test.tf          | 5 ++++-
 terraform/environments/nomis/locals_weblogic.tf      | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/terraform/environments/nomis/locals_preproduction.tf b/terraform/environments/nomis/locals_preproduction.tf
index e57be3347ee..d0fc561246d 100644
--- 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
index 08d118e7411..2708a5611ae 100644
--- a/terraform/environments/nomis/locals_test.tf
+++ b/terraform/environments/nomis/locals_test.tf
@@ -164,6 +164,9 @@ 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"
@@ -171,7 +174,7 @@ locals {
           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
index 2c3c61e3fe6..ad0c8fe942a 100644
--- 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, {})