Merge pull request #5238 from ministryofjustice/feature/DSOS-2654/ec2…

…-alterations DSOS-2653-t1-changes
ministryofjustice · Mar 7, 2024 · c60ed78 · c60ed78
2 parents 47ed924 + 2fe73f7
commit c60ed78
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 728 deletions.
diff --git a/terraform/environments/nomis-combined-reporting/locals_bip_cms.tf b/terraform/environments/nomis-combined-reporting/locals_bip_cms.tf
@@ -6,178 +6,6 @@ locals {
     }
   }
 
-  bip_cms_target_group_http_7777 = {
-    port                 = 7777
-    protocol             = "HTTP"
-    target_type          = "instance"
-    deregistration_delay = 30
-    health_check = {
-      enabled             = true
-      interval            = 30
-      healthy_threshold   = 3
-      matcher             = "200-399"
-      path                = "/"
-      port                = 7777
-      timeout             = 5
-      unhealthy_threshold = 5
-    }
-    stickiness = {
-      enabled = true
-      type    = "lb_cookie"
-    }
-  }
-  bip_cms_target_group_http_6410 = {
-    port                 = 6410
-    protocol             = "HTTP"
-    target_type          = "instance"
-    deregistration_delay = 30
-    health_check = {
-      enabled             = true
-      interval            = 30
-      healthy_threshold   = 3
-      matcher             = "200-399"
-      path                = "/"
-      port                = 6410
-      timeout             = 5
-      unhealthy_threshold = 5
-    }
-    stickiness = {
-      enabled = true
-      type    = "lb_cookie"
-    }
-  }
-  bip_cms_target_group_http_6400 = {
-    port                 = 6400
-    protocol             = "HTTP"
-    target_type          = "instance"
-    deregistration_delay = 30
-    health_check = {
-      enabled             = true
-      interval            = 30
-      healthy_threshold   = 3
-      matcher             = "200-399"
-      path                = "/"
-      port                = 6400
-      timeout             = 5
-      unhealthy_threshold = 5
-    }
-    stickiness = {
-      enabled = true
-      type    = "lb_cookie"
-    }
-  }
-  bip_cms_target_group_http_6455 = {
-    port                 = 6455
-    protocol             = "HTTP"
-    target_type          = "instance"
-    deregistration_delay = 30
-    health_check = {
-      enabled             = true
-      interval            = 30
-      healthy_threshold   = 3
-      matcher             = "200-399"
-      path                = "/"
-      port                = 6455
-      timeout             = 5
-      unhealthy_threshold = 5
-    }
-    stickiness = {
-      enabled = true
-      type    = "lb_cookie"
-    }
-  }
-
-  bip_cms_lb_listeners = {
-
-    http = {
-      port     = 80
-      protocol = "HTTP"
-
-      default_action = {
-        type = "redirect"
-        redirect = {
-          port        = 443
-          protocol    = "HTTPS"
-          status_code = "HTTP_301"
-        }
-      }
-    }
-
-    http7777 = {
-      port     = 7777
-      protocol = "HTTP"
-
-      default_action = {
-        type = "fixed-response"
-        fixed_response = {
-          content_type = "text/plain"
-          message_body = "Not implemented"
-          status_code  = "501"
-        }
-      }
-    }
-
-    http6410 = {
-      port     = 6410
-      protocol = "HTTP"
-
-      default_action = {
-        type = "fixed-response"
-        fixed_response = {
-          content_type = "text/plain"
-          message_body = "Not implemented"
-          status_code  = "501"
-        }
-      }
-    }
-
-    http6400 = {
-      port     = 6400
-      protocol = "HTTP"
-
-      default_action = {
-        type = "fixed-response"
-        fixed_response = {
-          content_type = "text/plain"
-          message_body = "Not implemented"
-          status_code  = "501"
-        }
-      }
-    }
-
-    http6455 = {
-      port     = 6455
-      protocol = "HTTP"
-
-      default_action = {
-        type = "fixed-response"
-        fixed_response = {
-          content_type = "text/plain"
-          message_body = "Not implemented"
-          status_code  = "501"
-        }
-      }
-    }
-
-    https = {
-      port                      = 443
-      protocol                  = "HTTPS"
-      ssl_policy                = "ELBSecurityPolicy-2016-08"
-      certificate_names_or_arns = ["nomis_combined_reporting_wildcard_cert"]
-      cloudwatch_metric_alarms  = module.baseline_presets.cloudwatch_metric_alarms.lb
-
-      default_action = {
-        type = "fixed-response"
-        fixed_response = {
-          content_type = "text/plain"
-          message_body = "Not implemented"
-          status_code  = "501"
-        }
-      }
-    }
-
-  }
-
   bip_cms_cloudwatch_metric_alarms = merge(
     module.baseline_presets.cloudwatch_metric_alarms.ec2,
     module.baseline_presets.cloudwatch_metric_alarms.ec2_cwagent_linux,
@@ -204,15 +32,6 @@ locals {
 
     user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_and_ansible
 
-    autoscaling_group = module.baseline_presets.ec2_autoscaling_group.default
-
-    lb_target_groups = {
-      http-7777 = local.bip_cms_target_group_http_7777
-      http-6455 = local.bip_cms_target_group_http_6455
-      http-6410 = local.bip_cms_target_group_http_6410
-      http-6400 = local.bip_cms_target_group_http_6400
-    }
-
     ebs_volumes = {
       "/dev/sdb" = { type = "gp3", size = 100 }
       "/dev/sdc" = { type = "gp3", size = 100 }