Merge branch 'main' into cel/azure-cloud-config

chucklever · web-flow · commit 30f984ce946f · 2025-12-01T10:48:17.000-05:00
diff --git a/PROMPTS.md b/PROMPTS.md
@@ -57,7 +57,7 @@ kdevops in-kernel and then in userspace. The in-kernel testing done requires
 using a loadable kernel module for each.
 
 We have support for bundling these two tests under the
-defconfigs/seltests-radix-tree defconfig and we use the
+defconfigs/selftests-radix-tree defconfig and we use the
 SELFTESTS_TEST_BUNDLE_RADIX_TREE to help us bundle all radix-tree related tests.
 We want to extend this with a new userspace only test. Its the vma tests on the
 Linux kernel. So it won't have a corresponding Linux kernel module load,
diff --git a/defconfigs/configs/selftests-kmod-no-timeout.config b/defconfigs/configs/selftests-kmod-no-timeout.config
@@ -0,0 +1 @@
+CONFIG_SELFTESTS_SECTION_KMOD_TIMEOUT=0
diff --git a/defconfigs/linux-firmware-kpd b/defconfigs/linux-firmware-kpd
@@ -1 +1 @@
-seltests-firmware
+selftests-firmware
diff --git a/defconfigs/linux-mm-kpd b/defconfigs/linux-mm-kpd
@@ -1 +1 @@
-seltests-radix-tree
+selftests-radix-tree
diff --git a/defconfigs/linux-modules-kpd b/defconfigs/linux-modules-kpd
@@ -1 +1 @@
-seltests-modules
+selftests-modules
diff --git a/defconfigs/selftests-firmware b/defconfigs/selftests-firmware
diff --git a/defconfigs/selftests-kmod b/defconfigs/selftests-kmod
diff --git a/defconfigs/selftests-maple b/defconfigs/selftests-maple
diff --git a/defconfigs/selftests-module b/defconfigs/selftests-module
diff --git a/defconfigs/selftests-modules b/defconfigs/selftests-modules
diff --git a/defconfigs/selftests-radix-tree b/defconfigs/selftests-radix-tree
diff --git a/defconfigs/selftests-vma b/defconfigs/selftests-vma
diff --git a/defconfigs/selftests-xarray b/defconfigs/selftests-xarray
diff --git a/playbooks/roles/extra_volumes/defaults/main.yml b/playbooks/roles/extra_volumes/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# This will be set from extra_vars.yaml based on Kconfig selection
+terraform_binary_path: "/usr/local/bin/terraform"
diff --git a/playbooks/roles/extra_volumes/tasks/providers/aws.yml b/playbooks/roles/extra_volumes/tasks/providers/aws.yml
@@ -17,6 +17,7 @@
   delegate_to: localhost
   run_once: true
   cloud.terraform.terraform_output:
+    binary_path: "{{ terraform_binary_path }}"
     format: json
     name: "extra_volumes_map"
     project_path: "{{ topdir_path }}/terraform/aws"
diff --git a/playbooks/roles/gen_tfvars/tasks/main.yml b/playbooks/roles/gen_tfvars/tasks/main.yml
@@ -28,6 +28,37 @@
     path: "{{ topdir_path }}/{{ kdevops_terraform_tfvars }}"
   register: kdevops_tfvars_dest
 
+- name: Find dynamic Kconfig files for {{ kdevops_terraform_provider }}
+  ansible.builtin.find:
+    paths: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}/kconfigs"
+    patterns: "Kconfig*.generated"
+  register: provider_kconfig_files
+  when:
+    - kdevops_enable_terraform
+
+- name: Check if any dynamic Kconfig files are empty
+  ansible.builtin.fail:
+    msg: |
+      ERROR: Dynamic cloud configuration not generated or incomplete.
+
+      Found {{ provider_kconfig_files.matched }} dynamic Kconfig file(s) for {{ kdevops_terraform_provider }},
+      but at least one is empty ({{ item.path }}).
+
+      Before running 'make' or 'make bringup', you must generate the
+      dynamic cloud configuration by running:
+
+          make cloud-config
+
+      For more information, run 'make help' and see the cloud-config
+      targets section.
+  when:
+    - kdevops_enable_terraform
+    - provider_kconfig_files.matched > 0
+    - item.size == 0
+  loop: "{{ provider_kconfig_files.files }}"
+  loop_control:
+    label: "{{ item.path }}"
+
 - name: Ensure proper permission on {{ kdevops_terraform_tfvars }}
   become: true
   become_flags: "su - -c"
diff --git a/playbooks/roles/install_terraform/defaults/main.yml b/playbooks/roles/install_terraform/defaults/main.yml
@@ -3,6 +3,7 @@
 
 # You can override these
 terraform_version: "1.2.3"
+opentofu_version: "1.6.0"
 force_install_if_present: false
 
 # Ignores using distro packages and installs from zip file instead
diff --git a/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml b/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml
@@ -4,6 +4,15 @@
   register: terraform_present
   changed_when: terraform_present.rc == 1
   failed_when: terraform_present.rc != 0 and terraform_present.rc != 1
+  when: terraform_use_terraform|bool
+  tags: ["terraform", "verify"]
+
+- name: Verify OpenTofu installation
+  ansible.builtin.command: "which tofu"
+  register: opentofu_present
+  changed_when: opentofu_present.rc == 1
+  failed_when: opentofu_present.rc != 0 and opentofu_present.rc != 1
+  when: terraform_use_opentofu|bool
   tags: ["terraform", "verify"]
 
 - name: Install Terraform Dependencies
@@ -23,4 +32,16 @@
     dest: /usr/local/bin
     remote_src: true
   when:
+    - terraform_use_terraform|bool
     - force_install_if_present|bool or terraform_present.rc != 0
+
+- name: Download OpenTofu from the latest release and install locally
+  become: true
+  become_method: sudo
+  ansible.builtin.unarchive:
+    src: https://github.com/opentofu/opentofu/releases/download/v{{ opentofu_version }}/tofu_{{ opentofu_version }}_linux_amd64.zip
+    dest: /usr/local/bin
+    remote_src: true
+  when:
+    - terraform_use_opentofu|bool
+    - force_install_if_present|bool or opentofu_present.rc != 0
diff --git a/playbooks/roles/install_terraform/tasks/install-deps/redhat/main.yml b/playbooks/roles/install_terraform/tasks/install-deps/redhat/main.yml
@@ -4,6 +4,15 @@
   register: terraform_present
   changed_when: terraform_present.rc == 1
   failed_when: terraform_present.rc != 0 and terraform_present.rc != 1
+  when: terraform_use_terraform|bool
+  tags: ["terraform", "verify"]
+
+- name: Verify OpenTofu installation
+  ansible.builtin.command: "which tofu"
+  register: opentofu_present
+  changed_when: opentofu_present.rc == 1
+  failed_when: opentofu_present.rc != 0 and opentofu_present.rc != 1
+  when: terraform_use_opentofu|bool
   tags: ["terraform", "verify"]
 
 - name: Download Terraform from the latest release and install locally
@@ -14,4 +23,16 @@
     dest: /usr/local/bin
     remote_src: true
   when:
+    - terraform_use_terraform|bool
     - force_install_if_present|bool or terraform_present.rc != 0
+
+- name: Download OpenTofu from the latest release and install locally
+  become: true
+  become_method: sudo
+  ansible.builtin.unarchive:
+    src: https://github.com/opentofu/opentofu/releases/download/v{{ opentofu_version }}/tofu_{{ opentofu_version }}_linux_amd64.zip
+    dest: /usr/local/bin
+    remote_src: true
+  when:
+    - terraform_use_opentofu|bool
+    - force_install_if_present|bool or opentofu_present.rc != 0
diff --git a/playbooks/roles/install_terraform/tasks/install-deps/suse/main.yml b/playbooks/roles/install_terraform/tasks/install-deps/suse/main.yml
@@ -17,6 +17,15 @@
   register: terraform_present
   changed_when: terraform_present.rc == 1
   failed_when: terraform_present.rc != 0 and terraform_present.rc != 1
+  when: terraform_use_terraform|bool
+  tags: ["terraform", "verify"]
+
+- name: Verify OpenTofu installation
+  ansible.builtin.command: "which tofu"
+  register: opentofu_present
+  changed_when: opentofu_present.rc == 1
+  failed_when: opentofu_present.rc != 0 and opentofu_present.rc != 1
+  when: terraform_use_opentofu|bool
   tags: ["terraform", "verify"]
 
 - name: Download Terraform from the latest release and install locally
@@ -27,17 +36,31 @@
     dest: /usr/local/bin
     remote_src: true
   when:
+    - terraform_use_terraform|bool
     - force_install_zip|bool
     - force_install_if_present|bool or (is_sle or is_leap and terraform_present.rc != 0)
 
-- name: Install vagrant and vagrant-libvirt from your tumbleweed repository
+- name: Download OpenTofu from the latest release and install locally
+  become: true
+  become_method: sudo
+  ansible.builtin.unarchive:
+    src: https://github.com/opentofu/opentofu/releases/download/v{{ opentofu_version }}/tofu_{{ opentofu_version }}_linux_amd64.zip
+    dest: /usr/local/bin
+    remote_src: true
+  when:
+    - terraform_use_opentofu|bool
+    - force_install_zip|bool
+    - force_install_if_present|bool or (is_sle or is_leap and opentofu_present.rc != 0)
+
+- name: Install terraform from your tumbleweed repository
   become: true
   become_method: sudo
   ansible.builtin.package:
     name:
       - terraform
     state: present
   when:
+    - terraform_use_terraform|bool
     - not force_install_zip|bool
     - not force_install_if_present|bool
     - terraform_present.rc != 0
diff --git a/playbooks/roles/terraform/defaults/main.yml b/playbooks/roles/terraform/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
 ssh_config_kexalgorithms: ""
+# This will be set from extra_vars.yaml based on Kconfig selection
+terraform_binary_path: "/usr/local/bin/terraform"
diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml
@@ -86,6 +86,7 @@
 
 - name: Bring up terraform resources
   cloud.terraform.terraform:
+    binary_path: "{{ terraform_binary_path }}"
     force_init: true
     project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
     state: present
@@ -94,6 +95,7 @@
 
 - name: Retrieve the controller_ip_map from terraform
   cloud.terraform.terraform_output:
+    binary_path: "{{ terraform_binary_path }}"
     format: json
     name: controller_ip_map
     project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
@@ -131,6 +133,7 @@
   block:
     - name: Retrieve the controller_ip_map from terraform
       cloud.terraform.terraform_output:
+        binary_path: "{{ terraform_binary_path }}"
         format: json
         name: controller_ip_map
         project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
@@ -165,6 +168,7 @@
 
 - name: Destroy terraform resources
   cloud.terraform.terraform:
+    binary_path: "{{ terraform_binary_path }}"
     force_init: true
     project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
     state: absent
diff --git a/terraform/Kconfig b/terraform/Kconfig
@@ -34,4 +34,37 @@ config TERRAFORM_PRIVATE_NET_MASK
 	depends on TERRAFORM_PRIVATE_NET
 	help
 	  Length of the network mask to use for the private network.
+
+choice
+	prompt "Infrastructure as Code tool"
+	default TERRAFORM_USE_TERRAFORM
+	help
+	  Choose whether to use Terraform or OpenTofu for infrastructure
+	  provisioning. OpenTofu is an open-source fork of Terraform that
+	  maintains compatibility with Terraform configurations.
+
+config TERRAFORM_USE_TERRAFORM
+	bool "Use Terraform"
+	output yaml
+	help
+	  Use HashiCorp Terraform for infrastructure provisioning.
+	  Terraform is the original infrastructure as code tool.
+
+config TERRAFORM_USE_OPENTOFU
+	bool "Use OpenTofu"
+	output yaml
+	help
+	  Use OpenTofu for infrastructure provisioning. OpenTofu is an
+	  open-source fork of Terraform maintained by the Linux Foundation
+	  that provides a community-driven alternative while maintaining
+	  compatibility with Terraform configurations.
+
+endchoice
+
+config TERRAFORM_BINARY_PATH
+	string
+	default "/usr/local/bin/terraform" if TERRAFORM_USE_TERRAFORM
+	default "/usr/local/bin/tofu" if TERRAFORM_USE_OPENTOFU
+	output yaml
+
 endif # TERRAFORM
diff --git a/workflows/selftests/tests/Makefile.module b/workflows/selftests/tests/Makefile.module
@@ -4,5 +4,5 @@ selftests-module:
 	$(Q)$(MAKE) selftests-baseline HOSTS=$(KDEVOPS_HOSTS_PREFIX)-module
 endif
 
-selftests-help-menu-target-modules:
+selftests-help-menu-target-module:
 	@echo "selftests-module                 - Runs selftests for module"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CONFIG_SELFTESTS_SECTION_KMOD_TIMEOUT=0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-seltests-firmware`
	`1`	`+selftests-firmware`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-seltests-radix-tree`
	`1`	`+selftests-radix-tree`