Skip to content

Commit

Permalink
Bug 1780534: create bootstrap floating ip after the bootstrap machine
Browse files Browse the repository at this point in the history
Now we create the bootstrap floating ip in the beginning of the
installation and then wait the bootstrap machine to become ready.
If the provisioning takes more than 10 minutes, due to long image
uploading or other reasons, fip creation fails with timeout.
To prevent this we should create the fip when the machine is already
available.
  • Loading branch information
Fedosin committed Dec 10, 2019
1 parent 5dd2719 commit 669337a
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions data/data/openstack/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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"]
}

0 comments on commit 669337a

Please sign in to comment.