container-common: allow podman for other distros

Currently podman installation is very tied to RHEL 8 even if we're
able to install it on Debian/Ubuntu distribution.
This patch changes the way we are starting or not the (fat) container
daemon. Before the condition was based on the distribution release
and now on the container_service_name variable.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit d2ad191eca015ba3a6a66b4bc16f5c19cf7053ed)

diff --git a/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
index f64995b787dc53a1b2901d4784095af56892ac53..b865175a0e5ef761a239d10030f916b6c68a0ee3 100644 (file)
--- a/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
@@ -40,8 +40,7 @@
     enabled: yes
   tags:
     with_pkg
-  when: not (ansible_os_family == 'RedHat' and
-             ansible_distribution_major_version == '8')
+  when: container_service_name == 'docker'
 
 - name: ensure tmpfiles.d is present
   lineinfile:

diff --git a/roles/ceph-container-common/vars/RedHat-8.yml b/roles/ceph-container-common/vars/RedHat-8.yml
index 9a42bcb449e59640a8e1c5215123d7c84602278d..3a93dbd046ed67f7099bded503ca96971d0373ed 100644 (file)
--- a/roles/ceph-container-common/vars/RedHat-8.yml
+++ b/roles/ceph-container-common/vars/RedHat-8.yml
@@ -1,3 +1,4 @@
 ---
 container_package_name: podman
+container_service_name: podman
 container_binding_name: podman