Merge pull request #8264 from r4f4/bootstrap-ssh-fix

OCPBUGS-32174: save correct bootstrap public IP

Author: openshift-merge-bot[bot]

data/data/aws/bootstrap/main.tf

@@ -161,7 +161,7 @@ resource "aws_instance" "bootstrap" {
   subnet_id                   = var.aws_publish_strategy == "External" ? var.public_subnet_ids[0] : var.private_subnet_ids[0]
   user_data                   = var.aws_bootstrap_stub_ignition
   vpc_security_group_ids      = [var.master_sg_id, aws_security_group.bootstrap.id]
-  associate_public_ip_address = local.public_endpoints
+  associate_public_ip_address = local.public_endpoints && var.aws_public_ipv4_pool == ""
 
   lifecycle {
     # Ignore changes in the AMI which force recreation of the resource. This
@@ -251,9 +251,17 @@ resource "aws_security_group_rule" "bootstrap_journald_gateway" {
 }
 
 resource "aws_eip" "bootstrap" {
+  count            = var.aws_public_ipv4_pool == "" ? 0 : 1
   domain           = "vpc"
   instance         = aws_instance.bootstrap.id
-  public_ipv4_pool = var.aws_public_ipv4_pool == "" ? null : var.aws_public_ipv4_pool
+  public_ipv4_pool = var.aws_public_ipv4_pool
+
+  tags = merge(
+    {
+      "Name" = "${var.cluster_id}-bootstrap-eip"
+    },
+    local.tags,
+  )
 
   depends_on = [aws_instance.bootstrap]
-}
+}

data/data/aws/bootstrap/outputs.tf

@@ -1,3 +1,3 @@
 output "bootstrap_ip" {
-  value = local.public_endpoints ? aws_instance.bootstrap.public_ip : aws_instance.bootstrap.private_ip
+  value = var.aws_public_ipv4_pool != "" ? aws_eip.bootstrap[0].public_ip : local.public_endpoints ? aws_instance.bootstrap.public_ip : aws_instance.bootstrap.private_ip
 }