From d2ad191eca015ba3a6a66b4bc16f5c19cf7053ed Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 10 May 2019 15:35:17 -0400 Subject: [PATCH] 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 --- .../tasks/pre_requisites/prerequisites.yml | 3 +-- roles/ceph-container-common/vars/RedHat-8.yml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml index f64995b78..b865175a0 100644 --- 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 9a42bcb44..3a93dbd04 100644 --- 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 -- 2.47.3