Skip to content

Prevent FIPs being released from project on terraform destroy #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions environments/lab/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -340,33 +340,19 @@ resource "openstack_compute_instance_v2" "computes" {

# --- floating ips ---

resource "openstack_networking_floatingip_v2" "logins" {

for_each = var.login_names

pool = data.openstack_networking_network_v2.external.name
# address = var.login_ips[each.key]
}

resource "openstack_compute_floatingip_associate_v2" "logins" {
for_each = var.login_names

floating_ip = openstack_networking_floatingip_v2.logins[each.key].address
floating_ip = var.login_ips[each.key]
instance_id = openstack_compute_instance_v2.logins[each.key].id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.logins[each.key].network.2.fixed_ip_v4

}

resource "openstack_networking_floatingip_v2" "control" {

pool = data.openstack_networking_network_v2.external.name
# address = var.control_ip
}

resource "openstack_compute_floatingip_associate_v2" "control" {

floating_ip = openstack_networking_floatingip_v2.control.address
floating_ip = var.control_ip
instance_id = openstack_compute_instance_v2.control.id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.control.network.2.fixed_ip_v4
Expand All @@ -380,7 +366,7 @@ resource "local_file" "hosts" {
{
"cluster_name": var.cluster_name
"cluster_slurm_name": var.cluster_slurm_name
"proxy_fip": openstack_networking_floatingip_v2.logins[var.proxy_name].address
"proxy_fip": var.login_ips[var.proxy_name]
"control": openstack_compute_instance_v2.control,
"logins": openstack_compute_instance_v2.logins,
"computes": openstack_compute_instance_v2.computes,
Expand Down
4 changes: 2 additions & 2 deletions environments/lab/terraform/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ login_names = {
#

login_ips = {
login-1: "10.60.105.223"
login-1: "128.232.226.207"
}
#

Expand All @@ -51,7 +51,7 @@ login_flavor = "vm.ska.cpu.general.small"
control_image = "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2"
control_flavor = "vm.ska.cpu.general.small"

control_ip = "10.60.106.230"
control_ip = "128.232.226.198"

proxy_name = "login-1"

Expand Down
20 changes: 3 additions & 17 deletions environments/prod/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -340,33 +340,19 @@ resource "openstack_compute_instance_v2" "computes" {

# --- floating ips ---

resource "openstack_networking_floatingip_v2" "logins" {

for_each = var.login_names

pool = data.openstack_networking_network_v2.external.name
address = var.login_ips[each.key]
}

resource "openstack_compute_floatingip_associate_v2" "logins" {
for_each = var.login_names

floating_ip = openstack_networking_floatingip_v2.logins[each.key].address
floating_ip = var.login_ips[each.key]
instance_id = openstack_compute_instance_v2.logins[each.key].id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.logins[each.key].network.2.fixed_ip_v4

}

resource "openstack_networking_floatingip_v2" "control" {

pool = data.openstack_networking_network_v2.external.name
address = var.control_ip
}

resource "openstack_compute_floatingip_associate_v2" "control" {

floating_ip = openstack_networking_floatingip_v2.control.address
floating_ip = var.control_ip
instance_id = openstack_compute_instance_v2.control.id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.control.network.2.fixed_ip_v4
Expand All @@ -380,7 +366,7 @@ resource "local_file" "hosts" {
{
"cluster_name": var.cluster_name
"cluster_slurm_name": var.cluster_slurm_name
"proxy_fip": openstack_networking_floatingip_v2.logins[var.proxy_name].address
"proxy_fip": var.login_ips[var.proxy_name]
"control": openstack_compute_instance_v2.control,
"logins": openstack_compute_instance_v2.logins,
"computes": openstack_compute_instance_v2.computes,
Expand Down
20 changes: 3 additions & 17 deletions environments/vtest/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -340,33 +340,19 @@ resource "openstack_compute_instance_v2" "computes" {

# --- floating ips ---

resource "openstack_networking_floatingip_v2" "logins" {

for_each = var.login_names

pool = data.openstack_networking_network_v2.external.name
address = var.login_ips[each.key]
}

resource "openstack_compute_floatingip_associate_v2" "logins" {
for_each = var.login_names

floating_ip = openstack_networking_floatingip_v2.logins[each.key].address
floating_ip = var.login_ips[each.key]
instance_id = openstack_compute_instance_v2.logins[each.key].id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.logins[each.key].network.2.fixed_ip_v4

}

resource "openstack_networking_floatingip_v2" "control" {

pool = data.openstack_networking_network_v2.external.name
address = var.control_ip
}

resource "openstack_compute_floatingip_associate_v2" "control" {

floating_ip = openstack_networking_floatingip_v2.control.address
floating_ip = var.control_ip
instance_id = openstack_compute_instance_v2.control.id
# networks are zero-indexed
fixed_ip = openstack_compute_instance_v2.control.network.2.fixed_ip_v4
Expand All @@ -380,7 +366,7 @@ resource "local_file" "hosts" {
{
"cluster_name": var.cluster_name
"cluster_slurm_name": var.cluster_slurm_name
"proxy_fip": openstack_networking_floatingip_v2.logins[var.proxy_name].address
"proxy_fip": var.login_ips[var.proxy_name]
"control": openstack_compute_instance_v2.control,
"logins": openstack_compute_instance_v2.logins,
"computes": openstack_compute_instance_v2.computes,
Expand Down