Merge pull request #4243 from ministryofjustice/csr/DSOS-2410/fix-lb-…

…issue-and-setup-cert Fix lb creation issue and create wildcard cert for lb - centralised remote desktop solution
ministryofjustice · Dec 5, 2023 · 8172d2a · 8172d2a
2 parents 69e6388 + 508bf32
commit 8172d2a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/terraform/environments/hmpps-domain-services/locals.tf b/terraform/environments/hmpps-domain-services/locals.tf
@@ -11,7 +11,7 @@ locals {
   baseline_environment_config = local.environment_configs[local.environment]
 
   baseline_presets_options = {
-    enable_application_environment_wildcard_cert = false
+    enable_application_environment_wildcard_cert = true
     enable_backup_plan_daily_and_weekly          = true
     enable_business_unit_kms_cmks                = true
     enable_image_builder                         = true
@@ -69,7 +69,8 @@ locals {
   baseline_secretsmanager_secrets = {}
 
   baseline_security_groups = {
-    private-dc = local.security_groups.private_dc
+    private-dc    = local.security_groups.private_dc
+    load-balancer = local.security_groups.load-balancer
   }
 
   baseline_sns_topics     = {}

diff --git a/terraform/environments/hmpps-domain-services/locals_security_groups.tf b/terraform/environments/hmpps-domain-services/locals_security_groups.tf
@@ -136,20 +136,6 @@ locals {
           protocol    = "TCP"
           cidr_blocks = local.security_group_cidrs.enduserclient
         }
-        http7770_7771_lb = {
-          description = "Allow http 7770-7771 ingress"
-          from_port   = 7770
-          to_port     = 7771
-          protocol    = "TCP"
-          cidr_blocks = local.security_group_cidrs.enduserclient
-        }
-        http7780_7781_lb = {
-          description = "Allow http 7780-7781 ingress"
-          from_port   = 7780
-          to_port     = 7781
-          protocol    = "TCP"
-          cidr_blocks = local.security_group_cidrs.enduserclient
-        }
       }
       egress = {
         all = {

diff --git a/terraform/environments/hmpps-domain-services/locals_test.tf b/terraform/environments/hmpps-domain-services/locals_test.tf
@@ -211,7 +211,7 @@ locals {
             }
             stickiness = {
               enabled = true
-              type    = "source_ip"
+              type    = "lb_cookie"
             }
             #attachments = [
             #  { ec2_instance_name = "rds-gateway" },