diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 56e154b..96e6665 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -23,9 +23,10 @@ become: true tasks: - name: docker-entrypoint.sh - ansible.builtin.shell: | - set -euxo pipefail - /usr/local/bin/docker-entrypoint.sh /usr/sbin/sshd -eD + ansible.builtin.shell: + cmd: | + set -euxo pipefail + /usr/local/bin/docker-entrypoint.sh /usr/sbin/sshd -eD args: executable: "/bin/bash" async: 300 diff --git a/playbooks/cleanup.yml b/playbooks/cleanup.yml index 8654327..d7916d8 100644 --- 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/tasks/redhat.yml b/playbooks/tasks/redhat.yml index 80d7259..3d1e098 100644 --- 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 diff --git a/playbooks/verify.yml b/playbooks/verify.yml index 60d62fe..0a61146 100644 --- 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 index 2330074..3211e56 160000 --- a/roles/ansible +++ b/roles/ansible @@ -1 +1 @@ -Subproject commit 233007444c453199b7b9a6c0638d6c57aa3ad4bd +Subproject commit 3211e568a73de2761a24b18759569bb249da71f3 diff --git a/roles/catatonit b/roles/catatonit index 3601260..72aee84 160000 --- a/roles/catatonit +++ b/roles/catatonit @@ -1 +1 @@ -Subproject commit 36012604b9063d0934ddb0bbffc781b934fee0ea +Subproject commit 72aee84e9a7b90a7019c970d177b7a50e6a26341 diff --git a/roles/gosu b/roles/gosu index 1fcb22c..4c2a7d1 160000 --- a/roles/gosu +++ b/roles/gosu @@ -1 +1 @@ -Subproject commit 1fcb22cc02e8c50e0ac7e375e6d90bdf1e2650a3 +Subproject commit 4c2a7d1df0731737255929fc16f6d53169ddcc8d diff --git a/roles/locales b/roles/locales index ef7b108..0be73c5 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit ef7b1082b296d925587f2210c6e211a1427cc499 +Subproject commit 0be73c537acbc8acb0ce88897e09be749a24fa4e diff --git a/roles/python b/roles/python index 989eaa0..2df194f 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 989eaa0153a4427982d16106d50e8264043405ae +Subproject commit 2df194fbc78e28439cb22af576962a1ec31bbb9a diff --git a/roles/sshd b/roles/sshd index 5626952..8dbda7a 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit 56269523a5b032834b366392878867fd68ff1cff +Subproject commit 8dbda7a1efb791652642ce2518a95e155ba74455 diff --git a/roles/timezone b/roles/timezone index d38b48f..9a8c889 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit d38b48f4e8f948ed6e279e16fc76ddae1cdaf527 +Subproject commit 9a8c889afc2ed12dbeaa1df52b6c71a008baaf5f