fix: fix no key pairs setup for clients and protocol gws

weka · Oct 7, 2024 · 78a780a · 78a780a
1 parent c4f7a00
commit 78a780a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/clients.tf b/clients.tf
@@ -12,7 +12,7 @@ module "clients" {
   backends_asg_name            = aws_autoscaling_group.autoscaling_group.name
   alb_dns_name                 = var.create_alb ? var.alb_alias_name != "" ? aws_route53_record.lb_record[0].fqdn : aws_lb.alb[0].dns_name : null
   alb_listener_protocol        = var.alb_cert_arn == null ? "http" : "https"
-  key_pair_name                = var.key_pair_name != null ? var.key_pair_name : aws_key_pair.generated_key[0].key_name
+  key_pair_name                = var.enable_key_pair ? var.key_pair_name == null ? aws_key_pair.generated_key[0].key_name : var.key_pair_name : null
   assign_public_ip             = local.assign_public_ip
   placement_group_name         = var.client_placement_group_name != null || !var.client_use_backends_placement_group ? var.client_placement_group_name : local.backends_placement_group_name
   use_placement_group          = var.use_placement_group

diff --git a/protocol_gateways.tf b/protocol_gateways.tf
@@ -10,7 +10,7 @@ module "smb_protocol_gateways" {
   frontend_container_cores_num        = var.smb_protocol_gateway_fe_cores_num
   secondary_ips_per_nic               = var.smb_protocol_gateway_secondary_ips_per_nic
   instance_type                       = var.smb_protocol_gateway_instance_type
-  key_pair_name                       = var.key_pair_name != null ? var.key_pair_name : aws_key_pair.generated_key[0].key_name
+  key_pair_name                       = var.enable_key_pair ? var.key_pair_name == null ? aws_key_pair.generated_key[0].key_name : var.key_pair_name : null
   assign_public_ip                    = var.assign_public_ip
   placement_group_name                = local.backends_placement_group_name
   use_placement_group                 = var.use_placement_group
@@ -51,7 +51,7 @@ module "s3_protocol_gateways" {
   frontend_container_cores_num        = var.s3_protocol_gateway_fe_cores_num
   secondary_ips_per_nic               = 0
   instance_type                       = var.s3_protocol_gateway_instance_type
-  key_pair_name                       = var.key_pair_name != null ? var.key_pair_name : aws_key_pair.generated_key[0].key_name
+  key_pair_name                       = var.enable_key_pair ? var.key_pair_name == null ? aws_key_pair.generated_key[0].key_name : var.key_pair_name : null
   assign_public_ip                    = var.assign_public_ip
   placement_group_name                = local.backends_placement_group_name
   use_placement_group                 = var.use_placement_group
@@ -89,7 +89,7 @@ module "nfs_protocol_gateways" {
   frontend_container_cores_num        = var.nfs_protocol_gateway_fe_cores_num
   secondary_ips_per_nic               = var.nfs_protocol_gateway_secondary_ips_per_nic
   instance_type                       = var.nfs_protocol_gateway_instance_type
-  key_pair_name                       = var.key_pair_name != null ? var.key_pair_name : aws_key_pair.generated_key[0].key_name
+  key_pair_name                       = var.enable_key_pair ? var.key_pair_name == null ? aws_key_pair.generated_key[0].key_name : var.key_pair_name : null
   assign_public_ip                    = var.assign_public_ip
   placement_group_name                = local.backends_placement_group_name
   use_placement_group                 = var.use_placement_group