From 564b39efeb64cd4345703fd97d91862b6dadd188 Mon Sep 17 00:00:00 2001 From: dangel101 Date: Thu, 6 Oct 2022 15:39:50 +0300 Subject: [PATCH] use argv with command instead of quoting inside the command fixed in all places that replaced shell with command --- .../roles/gluster-replace-peers/tasks/peers.yml | 6 +++++- .../roles/gluster-replace-peers/tasks/volume.yml | 5 ++++- .../ovirt-host-deploy-facts/tasks/av-setup.yml | 8 +++++++- .../roles/ovirt-host-deploy-kernel/tasks/main.yml | 14 ++++++++++++-- .../ovirt-host-deploy-misc/tasks/tuned_profile.yml | 6 +++++- .../roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml | 10 ++++++++-- .../tasks/advanced-virtualization.yml | 8 +++++++- 7 files changed, 48 insertions(+), 9 deletions(-) diff --git a/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/peers.yml b/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/peers.yml index 4dd1eedcfae..2d97014b165 100644 --- a/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/peers.yml +++ b/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/peers.yml @@ -9,7 +9,11 @@ register: uuid - name: Get the state from peer file - ansible.builtin.command: grep state "/var/lib/glusterd/peers/{{ uuid.stdout | trim }}" + ansible.builtin.command: + argv: + - grep + - state + - "/var/lib/glusterd/peers/{{ uuid.stdout | trim }}" register: grepres1 - name: Get the state from the peer command diff --git a/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/volume.yml b/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/volume.yml index 92887f5c1d6..6fa46f6f260 100644 --- a/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/volume.yml +++ b/packaging/ansible-runner-service-project/project/roles/gluster-replace-peers/tasks/volume.yml @@ -3,7 +3,10 @@ - name: Fetch the directory and volume details block: - name: Get the list of volumes on the machine - ansible.builtin.command: ls "{{ glusterd_libdir }}/vols" + ansible.builtin.command: + argv: + - ls + - "{{ glusterd_libdir }}/vols" register: dir_list - name: Setting Facts for Volume diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/av-setup.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/av-setup.yml index 4c202b21fbd..7a8525ccffb 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/av-setup.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/av-setup.yml @@ -25,7 +25,13 @@ - ansible_distribution_version is version('8.3', '<=') - name: Enable advanced virtualization module - ansible.builtin.command: "dnf -y module enable virt:{{ virt_mod_ver }}" + ansible.builtin.command: + argv: + - dnf + - -y + - module + - enable + - "virt:{{ virt_mod_ver }}" when: - host_deploy_origin_type != ovirt_origin_type diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-kernel/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-kernel/tasks/main.yml index adb0dfb58d9..a1774f3bc51 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-kernel/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-kernel/tasks/main.yml @@ -21,9 +21,19 @@ when: uuid.changed | bool - name: Removing old kernel arguments - ansible.builtin.command: "grubby --update-kernel=ALL --remove-args '{{ host_deploy_kernel_cmdline_old }}'" + ansible.builtin.command: + argv: + - grubby + - --update-kernel=ALL + - --remove-args + - "'{{ host_deploy_kernel_cmdline_old }}'" when: host_deploy_kernel_cmdline_old is defined and host_deploy_kernel_cmdline_old - name: Adding new kernel arguments - ansible.builtin.command: "grubby --update-kernel=ALL --args '{{ host_deploy_kernel_cmdline_new }}'" + ansible.builtin.command: + argv: + - grubby + - --update-kernel=ALL + - --args + - "'{{ host_deploy_kernel_cmdline_new }}'" when: host_deploy_kernel_cmdline_new is defined and host_deploy_kernel_cmdline_new diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml index 7ffd8b24c55..8f673fc4c2f 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-misc/tasks/tuned_profile.yml @@ -10,7 +10,11 @@ state: started - name: Set tune profile - ansible.builtin.command: "tuned-adm profile {{ host_deploy_tuned_profile }}" + ansible.builtin.command: + argv: + - tuned-adm + - profile + - "{{ host_deploy_tuned_profile }}" register: tune_profile_set - name: Enable tune service diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml index f17488083b8..27d4deb8b9d 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml @@ -10,7 +10,10 @@ - block: - name: Get vdsm id - ansible.builtin.command: cat "{{ vdsm_id_file }}" + ansible.builtin.command: + argv: + - cat + - "{{ vdsm_id_file }}" register: vdsm_id_file_content - name: Set vdsm id @@ -47,7 +50,10 @@ register: stat_results - name: Detect vdsm id for ppc or ppc64 - ansible.builtin.command: cat "{{ ppc_system_id }}" + ansible.builtin.command: + argv: + - cat + - "{{ ppc_system_id }}" register: vdsm_id_res when: stat_results.stat.exists diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-upgrade/tasks/advanced-virtualization.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-upgrade/tasks/advanced-virtualization.yml index 77471bc1fae..8d127ce5abb 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-upgrade/tasks/advanced-virtualization.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-upgrade/tasks/advanced-virtualization.yml @@ -38,7 +38,13 @@ - latest_rh_rel is version('8.3', '<=') - name: Enable advanced virtualization module for relevant OS version - ansible.builtin.command: "dnf -y module enable virt:{{ virt_mod_ver }}" + ansible.builtin.command: + argv: + - dnf + - -y + - module + - enable + - "virt:{{ virt_mod_ver }}" when: - ansible_facts.packages['redhat-release'] is defined