feat(libvirt_manager): Account for non-zuul user when configuring ssh

It is possible to set a non-zuul user in a vm's config, this pulls in
the user from the config to account for this possibility when
managing ssh keys and ansible inventories.

Author: michburk

roles/libvirt_manager/tasks/generate_networking_data.yml

@@ -109,6 +109,7 @@
     _ssh_user: >-
       {{
         _cifmw_libvirt_manager_layout.vms[_vm_type].admin_user |
+        default(_cifmw_libvirt_manager_layout.vms[_vm_type].user) |
         default('zuul')
       }}
     _add_ansible_host: >-

roles/libvirt_manager/tasks/manage_vms.yml

@@ -22,7 +22,7 @@
         regex_replace('^.*-([0-9]+)$',
                       vm_type ~ '-\1')
       }}
-    _user: "{{ 'core' if vm is match('^(crc|ocp).*') else 'zuul' }}"
+    _user: "{{ 'core' if vm is match('^(crc|ocp).*') else vm_data.get('user', 'zuul') }}"
     dataset:
       ssh_dir: "{{ ansible_user_dir }}/.ssh"
       user: "{{ _user }}"
@@ -86,28 +86,29 @@
       ssh core@{{ vm_con_name }}
       "sudo growpart /dev/sda {{ _root_part }}; sudo xfs_growfs /;"
 
-- name: "Inject private key on hosts {{ vm }}"
+- name: "Manage ssh keys on {{ vm }}"
   when:
     - vm_type is match('^controller.*$')
     - _cifmw_libvirt_manager_layout.vms[vm_type].start | default(true)
-  delegate_to: "{{ vm_con_name }}"
-  remote_user: "{{ _init_admin_user }}"
-  ansible.builtin.copy:
-    dest: "/home/zuul/.ssh/id_cifw"
-    content: "{{ priv_key }}"
-    owner: "{{ cifmw_libvirt_manager_user }}"
-    group: "{{ cifmw_libvirt_manager_user }}"
-    mode: "0400"
+  vars:
+    _user: "{{ vm_data.get('user', 'zuul') }}"
+  block:
+    - name: "Inject private key on hosts {{ vm }}"
+      delegate_to: "{{ vm_con_name }}"
+      remote_user: "{{ _init_admin_user }}"
+      ansible.builtin.copy:
+        dest: "/home/{{ _user }}/.ssh/id_cifw"
+        content: "{{ priv_key }}"
+        owner: "{{ _user }}"
+        group: "{{ _user }}"
+        mode: "0400"
 
-- name: "Inject public key on hosts {{ vm }}"
-  when:
-    - vm_type is match('^controller.*$')
-    - _cifmw_libvirt_manager_layout.vms[vm_type].start | default(true)
-  delegate_to: "{{ vm_con_name }}"
-  remote_user: "{{ _init_admin_user }}"
-  ansible.builtin.copy:
-    dest: "/home/zuul/.ssh/id_cifw.pub"
-    content: "{{ pub_key }}"
-    owner: "{{ cifmw_libvirt_manager_user }}"
-    group: "{{ cifmw_libvirt_manager_user }}"
-    mode: "0444"
+    - name: "Inject public key on hosts {{ vm }}"
+      delegate_to: "{{ vm_con_name }}"
+      remote_user: "{{ _init_admin_user }}"
+      ansible.builtin.copy:
+        dest: "/home/{{ _user }}/.ssh/id_cifw.pub"
+        content: "{{ pub_key }}"
+        owner: "{{ _user }}"
+        group: "{{ _user }}"
+        mode: "0444"

roles/libvirt_manager/templates/inventory.yml.j2

@@ -5,7 +5,7 @@
 {% set hostname = (host.key is match('^ocp.*')) | ternary(ocp_name, host.key) %}
     {{ host.key }}:
       ansible_host: {{ hostname }}.utility
-      ansible_user: {{ _cifmw_libvirt_manager_layout.vms[item].admin_user | default('zuul') }}
+      ansible_user: {{ _cifmw_libvirt_manager_layout.vms[item].admin_user | default(_cifmw_libvirt_manager_layout.vms[item].user) | default('zuul') }}
       ansible_ssh_common_args: '-o StrictHostKeyChecking=no'
 {% if item is match('^crc.*')                            %}
       ansible_ssh_private_key_file: ~/.ssh/crc_key