From 479f89e9857d75080a498a87a0739121d36b1624 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Tue, 4 Jun 2024 17:19:57 +0100 Subject: [PATCH] Revert "onr: remove bods instance (#6408)" This reverts commit 03d699933ac50b57d16f000f8027a750a3f2b693. --- .../oasys-national-reporting/locals_test.tf | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/terraform/environments/oasys-national-reporting/locals_test.tf b/terraform/environments/oasys-national-reporting/locals_test.tf index 40c458876ab..5ac738f9d9a 100644 --- a/terraform/environments/oasys-national-reporting/locals_test.tf +++ b/terraform/environments/oasys-national-reporting/locals_test.tf @@ -34,6 +34,25 @@ locals { } baseline_ec2_instances = { + t2-onr-bods-1-a = merge(local.defaults_bods_ec2, { + config = merge(local.defaults_bods_ec2.config, { + availability_zone = "${local.region}a" + ebs_volumes_copy_all_from_ami = false + user_data_raw = module.baseline_presets.ec2_instance.user_data_raw["user-data-pwsh"] + ami_name = "hmpps_windows_server_2019_release_2024-05-02T00-00-37.552Z" # fixed to a specific version + }) + instance = merge(local.defaults_bods_ec2.instance, { + instance_type = "m4.xlarge" + }) + user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_and_ansible + # volumes are a direct copy of BODS in NCR + ebs_volumes = merge(local.defaults_bods_ec2.ebs_volumes, { + "/dev/sda1" = { type = "gp3", size = 100 } + "/dev/sdb" = { type = "gp3", size = 100 } + "/dev/sdc" = { type = "gp3", size = 100 } + "/dev/sds" = { type = "gp3", size = 100 } + }) + }) t2-onr-boe-1-a = merge(local.defaults_boe_ec2, { config = merge(local.defaults_boe_ec2.config, { instance_profile_policies = setunion(local.defaults_boe_ec2.config.instance_profile_policies, [ @@ -96,7 +115,7 @@ locals { ami_name = "base_rhel_6_10_*" }) instance = merge(local.defaults_web_ec2.instance, { - instance_type = "m4.large" + instance_type = "m4.large" metadata_options_http_tokens = "optional" # required as Rhel 6 cloud-init does not support IMDSv2 }) user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_and_ansible