Merge pull request #2784 from Fedosin/fip_timeout

Bug 1780534: create bootstrap floating ip after the bootstrap machine
openshift · Dec 12, 2019 · e445afa · e445afa
2 parents 0560e0e + 669337a
commit e445afa
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/data/data/openstack/bootstrap/main.tf b/data/data/openstack/bootstrap/main.tf
@@ -24,13 +24,6 @@ resource "openstack_networking_port_v2" "bootstrap_port" {
   }
 }
 
-resource "openstack_networking_floatingip_v2" "bootstrap_fip" {
-  description = "${var.cluster_id}-bootstrap-fip"
-  pool        = var.external_network
-  port_id     = openstack_networking_port_v2.bootstrap_port.id
-  tags        = ["openshiftClusterID=${var.cluster_id}"]
-}
-
 data "openstack_compute_flavor_v2" "bootstrap_flavor" {
   name = var.flavor_name
 }
@@ -52,3 +45,12 @@ resource "openstack_compute_instance_v2" "bootstrap" {
     openshiftClusterID = var.cluster_id
   }
 }
+
+resource "openstack_networking_floatingip_v2" "bootstrap_fip" {
+  description = "${var.cluster_id}-bootstrap-fip"
+  pool        = var.external_network
+  port_id     = openstack_networking_port_v2.bootstrap_port.id
+  tags        = ["openshiftClusterID=${var.cluster_id}"]
+
+  depends_on = ["openstack_compute_instance_v2.bootstrap"]
+}