[v2,01/12] guestfs: Rename the update_ssh_config_guestfs role

Commit Message

Chuck Lever Feb. 5, 2025, 3:52 p.m. UTC

From: Chuck Lever <[e-mail]>

The plan is to use this same mechanism for terraform as well. Rename
the role with a generic name.

Signed-off-by: Chuck Lever <[e-mail]>
---
 .../tasks/main.yml                                            | 0
 playbooks/update_ssh_config.yml                               | 4 ++++
 playbooks/update_ssh_config_guestfs.yml                       | 4 ----
 scripts/guestfs.Makefile                                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename playbooks/roles/{update_ssh_config_guestfs => update_ssh_config}/tasks/main.yml (100%)
 create mode 100644 playbooks/update_ssh_config.yml
 delete mode 100644 playbooks/update_ssh_config_guestfs.yml

Patch

diff --git a/playbooks/roles/update_ssh_config_guestfs/tasks/main.yml b/playbooks/roles/update_ssh_config/tasks/main.yml
similarity index 100%
rename from playbooks/roles/update_ssh_config_guestfs/tasks/main.yml
rename to playbooks/roles/update_ssh_config/tasks/main.yml
diff --git a/playbooks/update_ssh_config.yml b/playbooks/update_ssh_config.yml
new file mode 100644
index 000000000000..4c0315c24725
--- /dev/null
+++ b/playbooks/update_ssh_config.yml
@@ -0,0 +1,4 @@ 
+---
+- hosts: localhost
+  roles:
+    - role: update_ssh_config
diff --git a/playbooks/update_ssh_config_guestfs.yml b/playbooks/update_ssh_config_guestfs.yml
deleted file mode 100644
index 346b90245637..000000000000
--- a/playbooks/update_ssh_config_guestfs.yml
+++ /dev/null
@@ -1,4 +0,0 @@ 
----
-- hosts: localhost
-  roles:
-    - role: update_ssh_config_guestfs
diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile
index 52397d54b89b..fb47bf21ab2f 100644
--- a/scripts/guestfs.Makefile
+++ b/scripts/guestfs.Makefile
@@ -64,7 +64,7 @@  $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
 		ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
 			--inventory localhost, \
-			playbooks/update_ssh_config_guestfs.yml \
+			playbooks/update_ssh_config.yml \
 			--extra-vars=@./extra_vars.yaml \
 			-e 'ansible_python_interpreter=/usr/bin/python3' ;\
 		LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \