https://github.com/ansible/ansible-lint/pull/2527

alvistack · Oct 2, 2022 · c1e7b8d · c1e7b8d
1 parent 51d2d77
commit c1e7b8d
Show file tree

Hide file tree

Showing 42 changed files with 87 additions and 73 deletions.
diff --git a/playbooks/cleanup.yml b/playbooks/cleanup.yml
@@ -22,54 +22,59 @@
   ignore_unreachable: true
   tasks:
     - name: rm -rf /var/cache/ansible/*
-      ansible.builtin.raw: |
-        set -eu
-        rm -rf /var/cache/ansible/*
-        rm -rf /root/.cache/*
-        rm -rf /tmp/*
+      ansible.builtin.raw:
+        cmd: |
+          set -eu
+          rm -rf /var/cache/ansible/*
+          rm -rf /root/.cache/*
+          rm -rf /tmp/*
       args:
         executable: "/bin/bash"
       changed_when: false
       failed_when: false
 
     - name: debian | apt-get -y clean
-      ansible.builtin.raw: |
-        set -eu
-        apt-get -y autoremove
-        apt-get -y autoclean
-        apt-get -y clean
-        rm -rf /var/lib/apt/lists/*
+      ansible.builtin.raw:
+        cmd: |
+          set -eu
+          apt-get -y autoremove
+          apt-get -y autoclean
+          apt-get -y clean
+          rm -rf /var/lib/apt/lists/*
       args:
         executable: "/bin/bash"
       changed_when: false
       failed_when: false
 
     - name: redhat | yum clean all
-      ansible.builtin.raw: |
-        set -eu
-        yum clean all
-        rm -rf /var/cache/yum/*
+      ansible.builtin.raw:
+        cmd: |
+          set -eu
+          yum clean all
+          rm -rf /var/cache/yum/*
       args:
         executable: "/bin/bash"
       changed_when: false
       failed_when: false
 
     - name: suse | zypper clean --all
-      ansible.builtin.raw: |
-        set -eu
-        zypper clean --all
-        rm -rf /var/cache/zypper/*
+      ansible.builtin.raw:
+        cmd: |
+          set -eu
+          zypper clean --all
+          rm -rf /var/cache/zypper/*
       args:
         executable: "/bin/bash"
       changed_when: false
       failed_when: false
 
     - name: redhat | subscription-manager unregister
-      ansible.builtin.raw: |
-        set -eu
-        subscription-manager remove --all
-        subscription-manager unregister
-        subscription-manager clean
+      ansible.builtin.raw:
+        cmd: |
+          set -eu
+          subscription-manager remove --all
+          subscription-manager unregister
+          subscription-manager clean
       args:
         executable: "/bin/bash"
       changed_when: false

diff --git a/playbooks/converge.yml b/playbooks/converge.yml
@@ -208,9 +208,10 @@
       become_user: "vagrant"
       environment:
         PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      ansible.builtin.shell: |
-        set -euxo pipefail
-        vagrant plugin install vagrant-libvirt
+      ansible.builtin.shell:
+        cmd: |
+          set -euxo pipefail
+          vagrant plugin install vagrant-libvirt
       args:
         executable: "/bin/bash"
       register: result

diff --git a/playbooks/tasks/debian.yml b/playbooks/tasks/debian.yml
@@ -59,12 +59,14 @@
     - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: update-grub
-  ansible.builtin.command: update-grub
+  ansible.builtin.command:
+    cmd: update-grub
   changed_when: false
   failed_when: false
 
 - name: update-initramfs -c -k all
-  ansible.builtin.command: update-initramfs -c -k all
+  ansible.builtin.command:
+    cmd: update-initramfs -c -k all
   changed_when: false
   failed_when: false
 

diff --git a/playbooks/tasks/redhat.yml b/playbooks/tasks/redhat.yml
@@ -59,7 +59,8 @@
   failed_when: false
 
 - name: yum-config-manager --enable
-  ansible.builtin.command: yum-config-manager --{{ item.state }} {{ item.name }}
+  ansible.builtin.command:
+    cmd: yum-config-manager --{{ item.state }} {{ item.name }}
   loop: "{{ _yum_config_manager }}"
   changed_when: false
   failed_when: false
@@ -96,12 +97,14 @@
     - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
-  ansible.builtin.command: grub2-mkconfig -o /boot/grub2/grub.cfg
+  ansible.builtin.command:
+    cmd: grub2-mkconfig -o /boot/grub2/grub.cfg
   changed_when: false
   failed_when: false
 
 - name: dracut -f
-  ansible.builtin.command: dracut -f
+  ansible.builtin.command:
+    cmd: dracut -f
   changed_when: false
   failed_when: false
 

diff --git a/playbooks/tasks/suse.yml b/playbooks/tasks/suse.yml
@@ -65,12 +65,14 @@
     - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
-  ansible.builtin.command: grub2-mkconfig -o /boot/grub2/grub.cfg
+  ansible.builtin.command:
+    cmd: grub2-mkconfig -o /boot/grub2/grub.cfg
   changed_when: false
   failed_when: false
 
 - name: dracut -f
-  ansible.builtin.command: dracut -f
+  ansible.builtin.command:
+    cmd: dracut -f
   changed_when: false
   failed_when: false
 

diff --git a/playbooks/verify.yml b/playbooks/verify.yml
@@ -41,9 +41,10 @@
           skip: true
 
     - name: ssh-keygen
-      ansible.builtin.shell: |
-        set -euxo pipefail
-        ssh-keygen -A
+      ansible.builtin.shell:
+        cmd: |
+          set -euxo pipefail
+          ssh-keygen -A
       args:
         executable: "/bin/bash"
       changed_when: false

diff --git a/roles/ansible b/roles/ansible
diff --git a/roles/bootstrap b/roles/bootstrap
diff --git a/roles/buildah b/roles/buildah
diff --git a/roles/cloud_init b/roles/cloud_init
diff --git a/roles/conmon b/roles/conmon
diff --git a/roles/containernetworking_plugins b/roles/containernetworking_plugins
diff --git a/roles/containers_common b/roles/containers_common
diff --git a/roles/crun b/roles/crun
diff --git a/roles/cvs b/roles/cvs
diff --git a/roles/git b/roles/git
diff --git a/roles/gitlab_runner b/roles/gitlab_runner
diff --git a/roles/httpd b/roles/httpd
diff --git a/roles/kernel b/roles/kernel
diff --git a/roles/libvirt b/roles/libvirt
diff --git a/roles/locales b/roles/locales
diff --git a/roles/mariadb b/roles/mariadb
diff --git a/roles/mercurial b/roles/mercurial
diff --git a/roles/molecule b/roles/molecule
diff --git a/roles/node b/roles/node
diff --git a/roles/openjdk b/roles/openjdk
diff --git a/roles/packer b/roles/packer
diff --git a/roles/perforce b/roles/perforce
diff --git a/roles/php b/roles/php
diff --git a/roles/podman b/roles/podman
diff --git a/roles/postgres b/roles/postgres
diff --git a/roles/python b/roles/python
diff --git a/roles/rclone b/roles/rclone
diff --git a/roles/restic b/roles/restic
diff --git a/roles/skopeo b/roles/skopeo
diff --git a/roles/sqlite b/roles/sqlite
diff --git a/roles/sshd b/roles/sshd
diff --git a/roles/svn b/roles/svn
diff --git a/roles/timezone b/roles/timezone
diff --git a/roles/vagrant b/roles/vagrant
diff --git a/roles/vim b/roles/vim
diff --git a/roles/virtualbox b/roles/virtualbox