[PATCH v2 12/33] terraform: Remove "delegate_to: localhost"

[Luis Chamberlain <mcgrof@kernel.org>]

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

Refactor: All tasks in this playbook execute only on the controller.
This enables the role definition and Makefile to be simplified.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/terraform/tasks/main.yml | 6 ------
 playbooks/terraform.yml                  | 3 ++-
 scripts/terraform.Makefile               | 6 +++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml
index b50b417d..b7ae0f0a 100644
--- a/playbooks/roles/terraform/tasks/main.yml
+++ b/playbooks/roles/terraform/tasks/main.yml
@@ -8,8 +8,6 @@
     - bringup
 
 - name: Retrieve the controller_ip_map from terraform
-  delegate_to: localhost
-  run_once: true
   cloud.terraform.terraform_output:
     format: json
     name: controller_ip_map
@@ -19,8 +17,6 @@
     - ssh
 
 - name: Add each target node's ssh Host entry on the control host
-  delegate_to: localhost
-  run_once: true
   ansible.builtin.blockinfile:
     block: "{{ lookup('template', 'ssh_config.j2') }}"
     create: true
@@ -33,8 +29,6 @@
     - ssh
 
 - name: Ensure the Include directive is present on the controller
-  delegate_to: localhost
-  run_once: true
   ansible.builtin.blockinfile:
     path: "{{ sshconfig }}"
     insertbefore: BOF
diff --git a/playbooks/terraform.yml b/playbooks/terraform.yml
index 15872a61..61dc76c2 100644
--- a/playbooks/terraform.yml
+++ b/playbooks/terraform.yml
@@ -1,6 +1,7 @@
 ---
 - name: Provision target nodes with terraform
   gather_facts: false
-  hosts: all
+  connection: local
+  hosts: localhost
   roles:
     - role: terraform
diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index f2f6fe0a..adfd359c 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -101,13 +101,13 @@ ANSIBLE_EXTRA_ARGS += $(TERRAFORM_EXTRA_VARS)
 
 bringup_terraform:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		--connection=local --inventory localhost, \
+		--inventory localhost, \
 		playbooks/terraform.yml --tags bringup \
 		--extra-vars=@./extra_vars.yaml
 
 $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) \
+		--inventory localhost, \
 		playbooks/terraform.yml --tags ssh \
 		--extra-vars=@./extra_vars.yaml
 	$(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -m wait_for_connection
@@ -118,7 +118,7 @@ status_terraform:
 
 destroy_terraform:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		--connection=local --inventory localhost, \
+		--inventory localhost, \
 		playbooks/terraform.yml --tags destroy \
 		--extra-vars=@./extra_vars.yaml
 	$(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG)
-- 
2.47.2