From 3414a3e282310780d2d5756cbcb63ffb59a778e6 Mon Sep 17 00:00:00 2001 From: SahidKhan89 Date: Thu, 27 Jun 2024 14:28:11 +0100 Subject: [PATCH 1/5] CC-2679: Update instance types for ebs app and conc --- .../environments/ccms-ebs-upgrade/application_variables.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/environments/ccms-ebs-upgrade/application_variables.json b/terraform/environments/ccms-ebs-upgrade/application_variables.json index 3f1bd36de50..a7b32491888 100644 --- 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.4xlarge", "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", From 43d319b1c1dca3494e52b15d870df608f5ff2346 Mon Sep 17 00:00:00 2001 From: SahidKhan89 Date: Thu, 27 Jun 2024 14:35:28 +0100 Subject: [PATCH 2/5] CC-2679: Update instance types for ebs app and conc --- .../environments/ccms-ebs-upgrade/application_variables.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/environments/ccms-ebs-upgrade/application_variables.json b/terraform/environments/ccms-ebs-upgrade/application_variables.json index a7b32491888..43823440c7c 100644 --- a/terraform/environments/ccms-ebs-upgrade/application_variables.json +++ b/terraform/environments/ccms-ebs-upgrade/application_variables.json @@ -13,7 +13,7 @@ "ec2_oracle_instance_type_ebsdb": "m5d.4xlarge", "ec2_oracle_instance_cores_ebsdb": "8", "ec2_oracle_instance_threads_ebsdb": "2", - "ec2_oracle_instance_type_ebsconc": "m5.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": "m5.2xlarge", From 926993520173d3707d802c57743756bdc1b807dd Mon Sep 17 00:00:00 2001 From: SahidKhan89 Date: Thu, 27 Jun 2024 14:44:10 +0100 Subject: [PATCH 3/5] CC-2679: Update instance types for ebs app and conc --- terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf | 2 +- terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_conc.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf b/terraform/environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf index 8532ae6974a..01b096b0886 100644 --- 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 = true 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 index b4c4a58e46c..4994f071d58 100644 --- 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 = true associate_public_ip_address = false iam_instance_profile = aws_iam_instance_profile.iam_instace_profile_ccms_base.name From 94d9082f6322d8e3d842343fb6d63c7e9adb6709 Mon Sep 17 00:00:00 2001 From: SahidKhan89 Date: Thu, 27 Jun 2024 15:16:45 +0100 Subject: [PATCH 4/5] CC-2679: Update instance types for ebs app and conc --- .../environments/ccms-ebs-upgrade/application_variables.json | 4 +++- .../environments/ccms-ebs-upgrade/ec2-oracle_ebs_apps.tf | 2 +- .../environments/ccms-ebs-upgrade/ec2-oracle_ebs_conc.tf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/terraform/environments/ccms-ebs-upgrade/application_variables.json b/terraform/environments/ccms-ebs-upgrade/application_variables.json index 43823440c7c..cebb4cef342 100644 --- a/terraform/environments/ccms-ebs-upgrade/application_variables.json +++ b/terraform/environments/ccms-ebs-upgrade/application_variables.json @@ -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 index 01b096b0886..a151a62d58b 100644 --- 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 = true + 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 index 4994f071d58..7a59d382f58 100644 --- 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 = true + 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 From 106c0cac265b547af222d463b66e5905f57cfe5f Mon Sep 17 00:00:00 2001 From: SahidKhan89 Date: Thu, 27 Jun 2024 15:19:43 +0100 Subject: [PATCH 5/5] CC-2679: Update instance types for ebs app and conc --- .../environments/ccms-ebs-upgrade/application_variables.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/environments/ccms-ebs-upgrade/application_variables.json b/terraform/environments/ccms-ebs-upgrade/application_variables.json index cebb4cef342..fad1f0ba47e 100644 --- a/terraform/environments/ccms-ebs-upgrade/application_variables.json +++ b/terraform/environments/ccms-ebs-upgrade/application_variables.json @@ -57,7 +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_optimized": "true", "ebs_default_iops": 12000, "conc_no_instances": 1, "webgate_no_instances": 2, @@ -181,7 +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_optimized": "false", "ebs_default_iops": 12000, "conc_no_instances": 0, "webgate_no_instances": 2,