(multiple) Fix home directory path when delegating to localhost

When tasks delegate to localhost, ansible_user_dir may contain the
remote host's value rather than the local machine's home directory.  Use
lookup('env', 'HOME') to ensure the correct local home path is used for
SSH config operations.

Co-Authored-By: Claude <[email protected]>
Signed-off-by: Sergii Golovatiuk <[email protected]>

Author: 2 people

roles/libvirt_manager/tasks/clean_layout.yml

@@ -339,7 +339,7 @@
 - name: Clean local ssh config
   vars:
     cifmw_ssh_jumper_target: 'localhost'
-    cifmw_ssh_jumper_config_dir: "{{ ansible_user_dir }}/.ssh"
+    cifmw_ssh_jumper_config_dir: "{{ lookup('env', 'HOME') }}/.ssh"
   ansible.builtin.include_role:
     name: "ssh_jumper"
     tasks_from: "cleanup.yml"

roles/ssh_jumper/tasks/manage_ssh_jumper_entry.yml

@@ -18,31 +18,42 @@
   delegate_to: "{{ _config.target | default(omit) }}"
   vars:
     _ssh_dir: >-
-      {{
-        _config.ssh_dir |
-        default(cifmw_ssh_jumper_defaults.ssh_dir)
-      }}
+      {%- if _config.target is defined and _config.target == 'localhost' -%}
+      {{ lookup('env', 'HOME') }}/.ssh
+      {%- else -%}
+      {{ _config.ssh_dir }}
+      {%- endif -%}
   ansible.builtin.file:
-    path: "{{ _ssh_dir }}/cifmw_ssh_config.d//{{ inventory_hostname }}"
+    path: "{{ _ssh_dir }}/cifmw_ssh_config.d/{{ inventory_hostname }}"
     state: directory
     mode: '0700'
 
 - name: Include ~/.ssh/cifmw_ssh_config.d/inventory_hostname/*.conf
   delegate_to: "{{ _config.target | default(omit) }}"
   vars:
-    _ssh_dir: "{{ _config.ssh_dir | default(cifmw_ssh_jumper_defaults.ssh_dir) }}"
+    _ssh_dir: >-
+      {%- if _config.target is defined and _config.target == 'localhost' -%}
+      {{ lookup('env', 'HOME') }}/.ssh
+      {%- else -%}
+      {{ _config.ssh_dir }}
+      {%- endif -%}
   ansible.builtin.lineinfile:
     insertbefore: BOF
     create: true
     state: present
-    path: "{{ _ssh_dir | default((ansible_user_dir, '/.ssh') | path_join) }}/config"
+    path: "{{ _ssh_dir }}/config"
     mode: '0600'
     line: 'Include cifmw_ssh_config.d/{{ inventory_hostname }}/*.conf'
 
 - name: "Inject ssh jumpers for {{ _config.hostname }}"
   delegate_to: "{{ _config.target | default(omit) }}"
   vars:
-    _ssh_dir: "{{ _config.ssh_dir | default(cifmw_ssh_jumper_defaults.ssh_dir) }}"
+    _ssh_dir: >-
+      {%- if _config.target is defined and _config.target == 'localhost' -%}
+      {{ lookup('env', 'HOME') }}/.ssh
+      {%- else -%}
+      {{ _config.ssh_dir }}
+      {%- endif -%}
     _dir: "{{ _ssh_dir }}/cifmw_ssh_config.d/{{ inventory_hostname }}"
     _filename: >-
       {%- if _config.proxy_host is defined and _config.proxy_host is not none -%}

roles/ssh_jumper/vars/main.yml

@@ -15,7 +15,7 @@
 # under the License.
 
 cifmw_ssh_jumper_defaults:
-  ssh_dir: "{{ ansible_user_dir }}/.ssh"
+  ssh_dir: "{{ ansible_user_dir | default(lookup('env', 'HOME')) }}/.ssh"
   user: zuul
   patterns: []
   proxy_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"