From b391efffd55e172bd9c1a64bdc72d0e5eb262424 Mon Sep 17 00:00:00 2001 From: Keir Williams Date: Wed, 12 Jun 2024 17:28:27 +0100 Subject: [PATCH] onr: move jumpserver from ASG to single instance (#6552) --- .../oasys-national-reporting/locals_jumpserver.tf | 10 ++++------ .../oasys-national-reporting/locals_test.tf | 7 +------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/terraform/environments/oasys-national-reporting/locals_jumpserver.tf b/terraform/environments/oasys-national-reporting/locals_jumpserver.tf index 63799488ef7..4c0a657090c 100644 --- a/terraform/environments/oasys-national-reporting/locals_jumpserver.tf +++ b/terraform/environments/oasys-national-reporting/locals_jumpserver.tf @@ -1,12 +1,10 @@ locals { jumpserver_ec2 = { - autoscaling_group = module.baseline_presets.ec2_autoscaling_group.default_with_warm_pool - autoscaling_schedules = module.baseline_presets.ec2_autoscaling_schedules.working_hours - # ami has unwanted ephemeral device, don't copy all the ebs_volumes config = merge(module.baseline_presets.ec2_instance.config.default, { - ami_name = "base_windows_server_2012_r2_release_2024-*" - ami_owner = "374269020027" - availability_zone = null + ami_name = "base_windows_server_2012_r2_release_2024-*" + ami_owner = "374269020027" + availability_zone = "eu-west-2a" + # ami has unwanted ephemeral device, don't copy all the ebs_volumes ebs_volumes_copy_all_from_ami = false user_data_raw = module.baseline_presets.ec2_instance.user_data_raw["user-data-pwsh"] }) diff --git a/terraform/environments/oasys-national-reporting/locals_test.tf b/terraform/environments/oasys-national-reporting/locals_test.tf index 2d289f5952a..003630b0633 100644 --- a/terraform/environments/oasys-national-reporting/locals_test.tf +++ b/terraform/environments/oasys-national-reporting/locals_test.tf @@ -135,12 +135,6 @@ locals { instance_type = "m4.xlarge" }) }) - - test-onr-client-a = merge(local.jumpserver_ec2, { - autoscaling_group = merge(module.baseline_presets.ec2_autoscaling_group.default, { - desired_capacity = 0 - }) - }) } ec2_instances = { @@ -195,6 +189,7 @@ locals { oasys-national-reporting-environment = "t2" }) }) + t2-onr-client-a = local.jumpserver_ec2 } iam_policies = {