Merge branch 'main' into ci/image-description

sjpb · web-flow · commit 0ffe0c1dd1f2 · 2024-10-01T12:27:49.000+01:00
diff --git a/ansible/roles/cluster_infra/templates/providers.tf.j2 b/ansible/roles/cluster_infra/templates/providers.tf.j2
@@ -5,6 +5,10 @@ terraform {
   required_providers {
     openstack = {
       source = "terraform-provider-openstack/openstack"
+      # TODO we must upgrade to 3.0.0
+      # but only after we stop using the deprecated
+      # openstack_compute_floatingip_associate_v2
+      version = "~>2.1.0"
     }
   }
 }
diff --git a/ansible/roles/cluster_infra/templates/resources.tf.j2 b/ansible/roles/cluster_infra/templates/resources.tf.j2
@@ -572,7 +572,7 @@ data "openstack_networking_floatingip_v2" "cluster_floating_ip" {
   {% endif %}
 }
 
-resource "openstack_compute_floatingip_associate_v2" "login_floatingip_assoc" {
+resource "openstack_networking_floatingip_associate_v2" "login_floatingip_assoc" {
   floating_ip = "${data.openstack_networking_floatingip_v2.cluster_floating_ip.address}"
-  instance_id = "${openstack_compute_instance_v2.login.id}"
+  port_id = "${openstack_networking_port_v2.login.id}"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ terraform {`
`5`	`5`	`required_providers {`
`6`	`6`	`openstack = {`
`7`	`7`	`source = "terraform-provider-openstack/openstack"`
	`8`	`+ # TODO we must upgrade to 3.0.0`
	`9`	`+ # but only after we stop using the deprecated`
	`10`	`+ # openstack_compute_floatingip_associate_v2`
	`11`	`+ version = "~>2.1.0"`
`8`	`12`	`}`
`9`	`13`	`}`
`10`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ data "openstack_networking_floatingip_v2" "cluster_floating_ip" {`
`572`	`572`	`{% endif %}`
`573`	`573`	`}`
`574`	`574`
`575`		`-resource "openstack_compute_floatingip_associate_v2" "login_floatingip_assoc" {`
	`575`	`+resource "openstack_networking_floatingip_associate_v2" "login_floatingip_assoc" {`
`576`	`576`	`floating_ip = "${data.openstack_networking_floatingip_v2.cluster_floating_ip.address}"`
`577`		`- instance_id = "${openstack_compute_instance_v2.login.id}"`
	`577`	`+ port_id = "${openstack_networking_port_v2.login.id}"`
`578`	`578`	`}`