From 48dc56b2d2255764739b9e56d97469f3d91c8d93 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 23 Nov 2020 15:08:09 +0100 Subject: [PATCH] Recognize podman container runtime and ignore services there --- handlers/main.yml | 1 + tasks/install.yml | 1 + tests/tasks/restore.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/handlers/main.yml b/handlers/main.yml index 8c0eb7d..2b89cdc 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -7,6 +7,7 @@ when: - sshd_allow_reload|bool - ansible_virtualization_type|default(None) != 'docker' + - ansible_virtualization_type|default(None) != 'podman' - ansible_virtualization_type|default(None) != 'VirtualPC' # for Github Actions - ansible_connection != 'chroot' - ansible_os_family != 'AIX' diff --git a/tasks/install.yml b/tasks/install.yml index f357ee7..397bd9b 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -157,6 +157,7 @@ when: - sshd_manage_service|bool - ansible_virtualization_type|default(None) != 'docker' + - ansible_virtualization_type|default(None) != 'podman' - ansible_virtualization_type|default(None) != 'VirtualPC' # for Github Actions - ansible_connection != 'chroot' diff --git a/tests/tasks/restore.yml b/tests/tasks/restore.yml index 65e31a6..7c955b3 100644 --- a/tests/tasks/restore.yml +++ b/tests/tasks/restore.yml @@ -29,6 +29,7 @@ when: - __sshd_test_backup is defined - ansible_virtualization_type|default(None) != 'docker' + - ansible_virtualization_type|default(None) != 'podman' - ansible_virtualization_type|default(None) != 'VirtualPC' # for Github Actions - ansible_connection != 'chroot' - ansible_os_family != 'AIX'