[PATCH 13/40] terraform: Make use of the new "terraform_output" module

[Luis Chamberlain <mcgrof@kernel.org>]

From: Chuck Lever <chuck.lever@oracle.com>

The cloud.terraform collection has a terraform_output module that
can replace the invocation of the terraform command. This has two
main benefits:

1. It simplifies the loop over the IP map.

2. It prepares for the possibility of using OpenTofu instead of
   the terraform module.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/terraform/tasks/main.yml      | 21 +++++++------------
 .../roles/terraform/templates/ssh_config.j2   |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml
index dd478a04..942efb7e 100644
--- a/playbooks/roles/terraform/tasks/main.yml
+++ b/playbooks/roles/terraform/tasks/main.yml
@@ -10,32 +10,25 @@
 - name: Retrieve the controller_ip_map from terraform
   delegate_to: localhost
   run_once: true
-  ansible.builtin.command:
-    chdir: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
-    cmd: "terraform output -json controller_ip_map"
+  cloud.terraform.terraform_output:
+    format: json
+    name: controller_ip_map
+    project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}"
   register: terraform_output
-  changed_when: false
-  tags:
-    - ssh
-
-- name: Convert the retrieved controller_ip_map into a dictionary
-  delegate_to: localhost
-  run_once: true
-  ansible.builtin.set_fact:
-    controller_ip_map: "{{ terraform_output.stdout | from_json }}"
   tags:
     - ssh
 
 - name: Add each target node's ssh Host entry on the control host
   delegate_to: localhost
-  throttle: 1
+  run_once: true
   ansible.builtin.blockinfile:
     block: "{{ lookup('template', 'ssh_config.j2') }}"
     create: true
     dest: "{{ kdevops_ssh_config }}"
     insertafter: "EOF"
-    marker: "# {mark} host configuration for {{ inventory_hostname }}"
+    marker: "# {mark} host configuration for {{ item.key }}"
     mode: "u=rw,g=r,o=r"
+  loop: "{{ terraform_output.value | dict2items }}"
   tags:
     - ssh
 
diff --git a/playbooks/roles/terraform/templates/ssh_config.j2 b/playbooks/roles/terraform/templates/ssh_config.j2
index 3f6d6191..5e8adf02 100644
--- a/playbooks/roles/terraform/templates/ssh_config.j2
+++ b/playbooks/roles/terraform/templates/ssh_config.j2
@@ -1,5 +1,5 @@
-Host {{ inventory_hostname }} {{ controller_ip_map[inventory_hostname] }}
-	HostName {{ controller_ip_map[inventory_hostname] }}
+Host {{ item.key }} {{ item.value }}
+	HostName {{ item.value }}
 	User {{ kdevops_terraform_ssh_config_user }}
 	Port 22
 	IdentityFile {{ kdevops_terraform_ssh_config_privkey_file }}
-- 
2.47.2