[PATCH v1 3/6] guestfs: Refactor the construction of the virt-sysprep command line
Chuck Lever <[email protected]> Thu, 2 Oct 2025 16:21:37 -0400
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Chuck Lever <[email protected]> Refactor: The virt-sysprep command line arguments are the same for both invocations. I'm about to add more complexity. There's no sense in duplicating that. Generated-by: Claude AI Signed-off-by: Chuck Lever <[email protected]> --- .../roles/guestfs/tasks/bringup/main.yml | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/playbooks/roles/guestfs/tasks/bringup/main.yml b/playbooks/roles/guestfs/tasks/bringup/main.yml index e5fcbb2e1f21..ce7e4122d6e9 100644 --- a/playbooks/roles/guestfs/tasks/bringup/main.yml +++ b/playbooks/roles/guestfs/tasks/bringup/main.yml @@ -61,35 +61,30 @@ register: host_timezone delegate_to: localhost + - name: Build virt-sysprep command arguments for each target node + ansible.builtin.set_fact: + virt_sysprep_args: >- + {{ + [ + "virt-sysprep", + "-a", root_image, + "--hostname", inventory_hostname, + "--ssh-inject", "kdevops:file:" + ssh_key + ".pub", + "--timezone", host_timezone.stdout + ] + }} + - name: Build the root image for each target node (as root) become: true become_method: ansible.builtin.sudo ansible.builtin.command: - argv: - - "virt-sysprep" - - "-a" - - "{{ root_image }}" - - "--hostname" - - "{{ inventory_hostname }}" - - "--ssh-inject" - - "kdevops:file:{{ ssh_key }}.pub" - - "--timezone" - - "{{ host_timezone.stdout }}" + argv: "{{ virt_sysprep_args }}" when: - libvirt_uri_system|bool - name: Build the root image for each target node (non-root) ansible.builtin.command: - argv: - - "virt-sysprep" - - "-a" - - "{{ root_image }}" - - "--hostname" - - "{{ inventory_hostname }}" - - "--ssh-inject" - - "kdevops:file:{{ ssh_key }}.pub" - - "--timezone" - - "{{ host_timezone.stdout }}" + argv: "{{ virt_sysprep_args }}" when: - not libvirt_uri_system|bool -- 2.51.0