Skip to content

Commit 25a1ebd

Browse files
authored
Avoid tf updates to login/compute on control delete/recreate (#555)
1 parent eb216df commit 25a1ebd

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ module "compute" {
2828

2929
# computed
3030
k3s_token = local.k3s_token
31-
control_address = openstack_compute_instance_v2.control.access_ip_v4
31+
# not using openstack_compute_instance_v2.control.access_ip_v4 to avoid
32+
# updates to node metadata on deletion/recreation of the control node:
33+
control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]
3234
security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
3335
}

environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ module "login" {
77
nodes = each.value.nodes
88
flavor = each.value.flavor
99

10+
# always taken from top-level value:
1011
cluster_name = var.cluster_name
1112
cluster_domain_suffix = var.cluster_domain_suffix
13+
key_pair = var.key_pair
14+
environment_root = var.environment_root
1215

1316
# can be set for group, defaults to top-level value:
1417
image_id = lookup(each.value, "image_id", var.cluster_image_id)
@@ -25,9 +28,10 @@ module "login" {
2528
compute_init_enable = []
2629
ignore_image_changes = false
2730

28-
key_pair = var.key_pair
29-
environment_root = var.environment_root
31+
# computed
3032
k3s_token = local.k3s_token
31-
control_address = openstack_compute_instance_v2.control.access_ip_v4
33+
# not using openstack_compute_instance_v2.control.access_ip_v4 to avoid
34+
# updates to node metadata on deletion/recreation of the control node:
35+
control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]
3236
security_group_ids = [for o in data.openstack_networking_secgroup_v2.login: o.id]
3337
}

0 commit comments

Comments
 (0)