Revert "Merge remote-tracking branch 'origin/NIT-1408' into DBA-699"

This reverts commit c1e560f, reversing changes made to 8afad84.
ministryofjustice · Sep 5, 2024 · d980846 · d980846
1 parent c1e560f
commit d980846
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 36 deletions.
diff --git a/terraform/environments/delius-core/locals_development.tf b/terraform/environments/delius-core/locals_development.tf
@@ -25,8 +25,6 @@ locals {
     efs_provisioned_throughput  = null
     efs_backup_schedule         = "cron(0 19 * * ? *)",
     efs_backup_retention_period = "30"
-    efs_id                      = "fs-09e171610bb5c87c4"
-    efs_access_point_id         = "fsap-02598b3cfe2720697"
     port                        = 389
   }
 

diff --git a/terraform/environments/delius-core/locals_preproduction.tf b/terraform/environments/delius-core/locals_preproduction.tf
@@ -23,8 +23,6 @@ locals {
     efs_provisioned_throughput  = null
     efs_backup_schedule         = "cron(0 19 * * ? *)",
     efs_backup_retention_period = "30"
-    efs_id                      = "replace_this"
-    efs_access_point_id         = "replace_this"
     port                        = 389
   }
 

diff --git a/terraform/environments/delius-core/locals_stage.tf b/terraform/environments/delius-core/locals_stage.tf
@@ -23,8 +23,6 @@ locals {
     efs_provisioned_throughput  = null
     efs_backup_schedule         = "cron(0 19 * * ? *)",
     efs_backup_retention_period = "30"
-    efs_id                      = "replace_this"
-    efs_access_point_id         = "replace_this"
     port                        = 389
   }
 

diff --git a/terraform/environments/delius-core/locals_test.tf b/terraform/environments/delius-core/locals_test.tf
@@ -25,8 +25,6 @@ locals {
     efs_provisioned_throughput  = null
     efs_backup_schedule         = "cron(0 19 * * ? *)",
     efs_backup_retention_period = "30"
-    efs_id                      = "replace_this"
-    efs_access_point_id         = "replace_this"
     port                        = 389
   }
 

diff --git a/terraform/environments/delius-core/modules/delius_environment/ldap_ecs.tf b/terraform/environments/delius-core/modules/delius_environment/ldap_ecs.tf
@@ -22,7 +22,7 @@ module "ldap_ecs" {
   }
   container_secrets_env_specific = try(var.delius_microservice_configs.ldap.container_secrets_env_specific, {})
 
-  desired_count = 1
+  desired_count = 0
 
   container_port_config = [
     {
@@ -65,28 +65,5 @@ module "ldap_ecs" {
   frontend_lb_arn_suffix  = aws_lb.delius_core_ancillary.arn_suffix
   enable_platform_backups = var.enable_platform_backups
 
-  efs_volumes = [
-    {
-      host_path = null
-      name      = "delius-core-openldap"
-      efs_volume_configuration = [{
-        file_system_id          = var.ldap_config.efs_id
-        root_directory          = "/"
-        transit_encryption      = "ENABLED"
-        transit_encryption_port = 2049
-        authorization_config = [{
-          access_point_id = var.ldap_config.efs_access_point_id
-          iam             = "DISABLED"
-        }]
-      }]
-    }
-  ]
-
-  mount_points = [{
-    sourceVolume  = "delius-core-openldap"
-    containerPath = "/var/lib/openldap/openldap-data"
-    readOnly      = false
-  }]
-
 }
 
diff --git a/terraform/environments/delius-core/modules/delius_environment/variables.tf b/terraform/environments/delius-core/modules/delius_environment/variables.tf
@@ -29,8 +29,6 @@ variable "ldap_config" {
     efs_provisioned_throughput  = string
     efs_backup_schedule         = string
     efs_backup_retention_period = string
-    efs_id                      = string
-    efs_access_point_id         = string
     port                        = optional(number)
   })
   default = {
@@ -42,8 +40,6 @@ variable "ldap_config" {
     efs_provisioned_throughput  = "default_efs_provisioned_throughput"
     efs_backup_schedule         = "default_efs_backup_schedule"
     efs_backup_retention_period = "default_efs_backup_retention_period"
-    efs_id                      = "default_efs_id"
-    efs_access_point_id         = "default_efs_access_point_id"
     port                        = 389
   }
 }