Merge pull request #6775 from ministryofjustice/CC-2679

Cc 2679
ministryofjustice · Jun 27, 2024 · 8c0921a · 8c0921a
2 parents b56ccea + 106c0ca
commit 8c0921a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/terraform/environments/ccms-ebs-upgrade/application_variables.json b/terraform/environments/ccms-ebs-upgrade/application_variables.json
@@ -13,10 +13,10 @@
       "ec2_oracle_instance_type_ebsdb": "m5d.4xlarge",
       "ec2_oracle_instance_cores_ebsdb": "8",
       "ec2_oracle_instance_threads_ebsdb": "2",
-      "ec2_oracle_instance_type_ebsconc": "m5d.4xlarge",
+      "ec2_oracle_instance_type_ebsconc": "m5.2xlarge",
       "ec2_oracle_instance_cores_ebsconc": "8",
       "ec2_oracle_instance_threads_ebsconc": "2",
-      "ec2_oracle_instance_type_ebsapps": "m5d.2xlarge",
+      "ec2_oracle_instance_type_ebsapps": "m5.2xlarge",
       "ec2_oracle_instance_cores_ebsapps": "4",
       "ec2_oracle_instance_threads_ebsapps": "2",
       "ec2_oracle_instance_type_webgate": "m5d.large",
@@ -57,6 +57,7 @@
       "lz_ftp_bucket_environment": "development",
       "lz_domain_name": "*.dev.legalservices.gov.uk",
       "mp_aws_subnet_env": "10.200.0.0/20",
+      "ebs_optimized": "true",
       "ebs_default_iops": 12000,
       "conc_no_instances": 1,
       "webgate_no_instances": 2,
@@ -93,7 +94,7 @@
       "ebs_size_ebsdb_dbf04": 500,
       "ebs_size_ebsdb_redoA": 100,
       "ebs_size_ebsdb_redoB": 50,
-      "ebs_size_ebsdb_techst": 100,
+      "ebs_size_ebsdb_techst": 500,
       "ebs_size_ebsdb_backup": 8000,
       "ebs_size_ebsdb_diag": 50,
       "ebs_size_ebsdb_appshare": 100,
@@ -180,6 +181,7 @@
       "lz_ftp_bucket_environment": "uat",
       "lz_domain_name": "*.uat.legalservices.gov.uk",
       "mp_aws_subnet_env": "10.200.0.0/20",
+      "ebs_optimized": "false",
       "ebs_default_iops": 12000,
       "conc_no_instances": 0,
       "webgate_no_instances": 2,

diff --git a/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf b/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf
@@ -7,7 +7,7 @@ resource "aws_instance" "ec2_ebsapps" {
   subnet_id              = local.private_subnets[count.index]
   #subnet_id                   = data.aws_subnet.data_subnets_a.id
   monitoring                  = true
-  ebs_optimized               = false
+  ebs_optimized               = local.application_data.accounts[local.environment].ebs_optimized
   associate_public_ip_address = false
   iam_instance_profile        = aws_iam_instance_profile.iam_instace_profile_ccms_base.name
 

diff --git a/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_conc.tf b/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_conc.tf
@@ -6,7 +6,7 @@ resource "aws_instance" "ec2_oracle_conc" {
   vpc_security_group_ids      = [aws_security_group.ec2_sg_ebsconc.id]
   subnet_id                   = data.aws_subnet.data_subnets_a.id
   monitoring                  = true
-  ebs_optimized               = false
+  ebs_optimized               = local.application_data.accounts[local.environment].ebs_optimized
   associate_public_ip_address = false
   iam_instance_profile        = aws_iam_instance_profile.iam_instace_profile_ccms_base.name