From 7230b9fa8b2e623224f0635b08dfeb798e98dce5 Mon Sep 17 00:00:00 2001 From: sd109 Date: Fri, 14 Feb 2025 11:06:36 +0000 Subject: [PATCH 1/2] Update terraform provider openstack to v3 --- ansible/roles/cluster_infra/templates/providers.tf.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ansible/roles/cluster_infra/templates/providers.tf.j2 b/ansible/roles/cluster_infra/templates/providers.tf.j2 index 35d775e7f..284fa18a1 100644 --- a/ansible/roles/cluster_infra/templates/providers.tf.j2 +++ b/ansible/roles/cluster_infra/templates/providers.tf.j2 @@ -5,10 +5,7 @@ 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" + version = "~>3.0.0" } } } From 8230b756960a4eaeb2203eefeca878268d8c9472 Mon Sep 17 00:00:00 2001 From: sd109 Date: Mon, 10 Mar 2025 10:53:38 +0000 Subject: [PATCH 2/2] Pin terraform provider openstack to v3 everywhere --- environments/.stackhpc/tofu/main.tf | 5 +++-- .../skeleton/{{cookiecutter.environment}}/tofu/main.tf | 1 + .../{{cookiecutter.environment}}/tofu/node_group/main.tf | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/main.tf b/environments/.stackhpc/tofu/main.tf index 46c7badd0..7c6b774fb 100644 --- a/environments/.stackhpc/tofu/main.tf +++ b/environments/.stackhpc/tofu/main.tf @@ -5,6 +5,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" + version = "~>3.0.0" } } } @@ -86,9 +87,9 @@ module "cluster" { # flavor: var.other_node_flavor # } } - + volume_backed_instances = var.volume_backed_instances - + environment_root = var.environment_root # Can reduce volume size a lot for short-lived CI clusters: state_volume_size = 10 diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf index 49a84ffce..f29828499 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf @@ -3,6 +3,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" + version = "~>3.0.0" } } } diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/main.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/main.tf index 49a84ffce..f29828499 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/main.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/main.tf @@ -3,6 +3,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" + version = "~>3.0.0" } } }