From 6608f935ea1f812d59589fd4fa577ad760237d8e Mon Sep 17 00:00:00 2001 From: Hope Aitchison Date: Tue, 5 Mar 2024 09:21:41 +0000 Subject: [PATCH] rebuilding secondary db in csr pd --- .../locals_production.tf | 77 +++++++++---------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/terraform/environments/corporate-staff-rostering/locals_production.tf b/terraform/environments/corporate-staff-rostering/locals_production.tf index 258036a387e..321a9ec727e 100644 --- a/terraform/environments/corporate-staff-rostering/locals_production.tf +++ b/terraform/environments/corporate-staff-rostering/locals_production.tf @@ -102,51 +102,46 @@ locals { } }) - # removing temporarily due to licensing considerations - # pd-csr-db-b = merge(local.defaults_database_ec2, { - # config = merge(local.defaults_database_ec2.config, { - # ami_name = "hmpps_ol_8_5_oracledb_19c_release_2023-07-14T15-36-30.795Z" - # availability_zone = "${local.region}b" - # instance_profile_policies = concat(local.defaults_database_ec2.config.instance_profile_policies, [ - # "Ec2ProdDatabasePolicy", - # ]) - # }) - # instance = merge(local.defaults_database_ec2.instance, { - # instance_type = "r6i.xlarge" - # disable_api_stop = true - # metadata_options_http_tokens = "optional" # the Oracle installer cannot accommodate a token - # }) + pd-csr-db-b = merge(local.defaults_database_ec2, { + config = merge(local.defaults_database_ec2.config, { + ami_name = "hmpps_ol_8_5_oracledb_19c_release_2023-07-14T15-36-30.795Z" + availability_zone = "${local.region}b" + instance_profile_policies = concat(local.defaults_database_ec2.config.instance_profile_policies, [ + "Ec2ProdDatabasePolicy", + ]) + }) + instance = merge(local.defaults_database_ec2.instance, { + instance_type = "r6i.xlarge" + disable_api_stop = true + metadata_options_http_tokens = "optional" # the Oracle installer cannot accommodate a token + }) - # ebs_volumes = merge(local.defaults_database_ec2.ebs_volumes, { - # "/dev/sda1" = { label = "root", size = 30 } - # "/dev/sdb" = { label = "app", size = 100 } # /u01 - # "/dev/sdc" = { label = "app", size = 500 } # /u02 - # }) + ebs_volumes = merge(local.defaults_database_ec2.ebs_volumes, { + "/dev/sda1" = { label = "root", size = 30 } + "/dev/sdb" = { label = "app", size = 100 } # /u01 + "/dev/sdc" = { label = "app", size = 500 } # /u02 + }) - # ebs_volume_config = merge(local.defaults_database_ec2.ebs_volume_config, { - # data = { - # iops = 3000 - # throughput = 125 - # total_size = 1000 - # } - # flash = { - # iops = 3000 - # throughput = 125 - # total_size = 100 - # } - # }) + ebs_volume_config = merge(local.defaults_database_ec2.ebs_volume_config, { + data = { + total_size = 1500 + } + flash = { + total_size = 100 + } + }) - # secretsmanager_secrets = module.baseline_presets.ec2_instance.secretsmanager_secrets.oracle_19c + secretsmanager_secrets = module.baseline_presets.ec2_instance.secretsmanager_secrets.oracle_19c - # tags = { - # description = "PD CSR Oracle secondary DB server" - # ami = "base_ol_8_5" - # os-type = "Linux" - # component = "data" - # server-type = "csr-db" - # backup = "false" # opt out of mod platform default backup plan - # } - # }) + tags = { + description = "PD CSR Oracle secondary DB server" + ami = "base_ol_8_5" + os-type = "Linux" + component = "data" + server-type = "csr-db" + backup = "false" # opt out of mod platform default backup plan + } + }) pd-csr-a-7-a = merge(local.defaults_app_ec2, { config = merge(local.defaults_app_ec2.config, {