[PATCH 4/7] scripts: Remove OpenStack from terraform.Makefile

Chuck Lever <[email protected]> Fri, 31 Oct 2025 20:50:17 -0400
Newsgroups dev.linux.lists.kdevops
Message-ID <[email protected]>
From: Chuck Lever <[email protected]>

Remove OpenStack cloud provider configuration and variable handling
from the terraform Makefile. This includes the KDEVOPS_CLOUD_PROVIDER
export for OpenStack and all OpenStack-specific terraform variables.

Generated-by: Claude AI
Signed-off-by: Chuck Lever <[email protected]>
---
 scripts/terraform.Makefile | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index 1c9850356561..e18e12b6cb74 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -18,9 +18,6 @@ endif
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
 export KDEVOPS_CLOUD_PROVIDER=oci
 endif
-ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
-export KDEVOPS_CLOUD_PROVIDER=openstack
-endif
 ifeq (y,$(CONFIG_TERRAFORM_LAMBDALABS))
 export KDEVOPS_CLOUD_PROVIDER=lambdalabs
 endif
@@ -53,16 +50,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
 
 DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
 
-ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
-TERRAFORM_EXTRA_VARS += terraform_openstack_cloud_name=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_CLOUD_NAME))
-TERRAFORM_EXTRA_VARS += terraform_openstack_instance_prefix=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_INSTANCE_PREFIX))
-TERRAFORM_EXTRA_VARS += terraform_openstack_flavor=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_FLAVOR))
-TERRAFORM_EXTRA_VARS += terraform_openstack_ssh_pubkey_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_SSH_PUBKEY_NAME))
-TERRAFORM_EXTRA_VARS += terraform_openstack_public_network_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_PUBLIC_NETWORK_NAME))
-
-ANSIBLE_EXTRA_ARGS_SEPARATED += terraform_openstack_image_name=$(subst $(space),+,$(CONFIG_TERRAFORM_OPENSTACK_IMAGE_NAME))
-endif
-
 ifeq (y,$(CONFIG_TERRAFORM_PRIVATE_NET))
 TERRAFORM_EXTRA_VARS += terraform_private_net_enabled='true'
 TERRAFORM_EXTRA_VARS += terraform_private_net_prefix=$(subst ",,$(CONFIG_TERRAFORM_PRIVATE_NET_PREFIX))
-- 
2.51.0