diff --git a/terraform/environments/nomis-combined-reporting/locals_bip.tf b/terraform/environments/nomis-combined-reporting/locals_bip.tf index df5ec66f4e2..858183a54d9 100644 --- a/terraform/environments/nomis-combined-reporting/locals_bip.tf +++ b/terraform/environments/nomis-combined-reporting/locals_bip.tf @@ -27,7 +27,7 @@ locals { }) instance = merge(module.baseline_presets.ec2_instance.instance.default, { instance_type = "t3.large" - vpc_security_group_ids = ["private", "bip"] + vpc_security_group_ids = ["bip"] }) user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_and_ansible diff --git a/terraform/environments/nomis-combined-reporting/locals_preproduction.tf b/terraform/environments/nomis-combined-reporting/locals_preproduction.tf index 1173390a8ef..d656e3e9278 100644 --- a/terraform/environments/nomis-combined-reporting/locals_preproduction.tf +++ b/terraform/environments/nomis-combined-reporting/locals_preproduction.tf @@ -57,7 +57,7 @@ locals { mount_targets = [{ subnet_name = "private" availability_zones = ["eu-west-2a"] - security_groups = ["private", "bip"] + security_groups = ["bip"] }] } } diff --git a/terraform/environments/nomis-combined-reporting/locals_security_groups.tf b/terraform/environments/nomis-combined-reporting/locals_security_groups.tf index 092c83878fe..fdb161dc0f7 100644 --- a/terraform/environments/nomis-combined-reporting/locals_security_groups.tf +++ b/terraform/environments/nomis-combined-reporting/locals_security_groups.tf @@ -325,12 +325,11 @@ locals { self = true } oracle1521 = { - description = "Allow oracle database 1521 ingress" - from_port = "1521" - to_port = "1521" - protocol = "tcp" - cidr_blocks = local.security_group_cidrs.oracle_db - security_groups = ["private", "bip", "etl"] + description = "Allow oracle database 1521 ingress" + from_port = "1521" + to_port = "1521" + protocol = "tcp" + cidr_blocks = local.security_group_cidrs.oracle_db } oracle3872 = { description = "Allow oem agent ingress" diff --git a/terraform/environments/nomis-combined-reporting/locals_test.tf b/terraform/environments/nomis-combined-reporting/locals_test.tf index ead211c84e8..1737031f7bc 100644 --- a/terraform/environments/nomis-combined-reporting/locals_test.tf +++ b/terraform/environments/nomis-combined-reporting/locals_test.tf @@ -168,7 +168,7 @@ locals { enable_delete_protection = false load_balancer_type = "application" idle_timeout = 3600 - security_groups = ["private", "lb"] + security_groups = ["lb"] subnets = module.environment.subnets["private"].ids enable_cross_zone_load_balancing = true diff --git a/terraform/environments/nomis-combined-reporting/locals_web.tf b/terraform/environments/nomis-combined-reporting/locals_web.tf index 423ed52ef4e..dce36ca9520 100644 --- a/terraform/environments/nomis-combined-reporting/locals_web.tf +++ b/terraform/environments/nomis-combined-reporting/locals_web.tf @@ -28,7 +28,7 @@ locals { }) instance = merge(module.baseline_presets.ec2_instance.instance.default, { instance_type = "t3.large" - vpc_security_group_ids = ["private", "web"] + vpc_security_group_ids = ["web"] }) ebs_volumes = { "/dev/sdb" = { type = "gp3", size = 100 }