onr: move jumpserver from ASG to single instance (#6552)

ministryofjustice · Jun 12, 2024 · b391eff · b391eff
1 parent 8e03939
commit b391eff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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 = {