From 376cb86db29d4d97282ed1ef65fc40d7ff4d5091 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 17 May 2019 17:10:34 -0400 Subject: [PATCH] container-common: support podman on Ubuntu Currently we're only able to use podman on ubuntu if podman's installation is done manually before the ceph-ansible execution because the deb package is present in an external repository. We already manage the docker-ce installation via an external repository so we should be able to allow the podman installation with the same mechanism too. https://github.com/containers/libpod/blob/master/install.md#ubuntu Resolves: #3947 Signed-off-by: Dimitri Savineau (cherry picked from commit 518ab794fb0965c6ca8af56f18e0c54529eca8d5) --- .../tasks/pre_requisites/debian_prerequisites.yml | 10 ++++++++++ .../tasks/pre_requisites/prerequisites.yml | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/ceph-container-engine/tasks/pre_requisites/debian_prerequisites.yml b/roles/ceph-container-engine/tasks/pre_requisites/debian_prerequisites.yml index 726c016ab..4e0a0ef80 100644 --- a/roles/ceph-container-engine/tasks/pre_requisites/debian_prerequisites.yml +++ b/roles/ceph-container-engine/tasks/pre_requisites/debian_prerequisites.yml @@ -3,6 +3,7 @@ package: name: ['docker', 'docker-engine', 'docker.io', 'containerd', 'runc'] state: absent + when: container_package_name == 'docker-ce' - name: allow apt to use a repository over https (debian) package: @@ -16,7 +17,16 @@ url: 'https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg' register: result until: result is succeeded + when: container_package_name == 'docker-ce' - name: add docker repository apt_repository: repo: "deb https://download.docker.com/linux/{{ ansible_distribution | lower}} {{ ansible_distribution_release }} stable" + when: container_package_name == 'docker-ce' + +- name: add podman ppa repository + apt_repository: + repo: "ppa:projectatomic/ppa" + when: + - container_package_name == 'podman' + - ansible_distribution == 'Ubuntu' diff --git a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml index 8ad9229dc..76705758b 100644 --- a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml +++ b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml @@ -9,7 +9,6 @@ include_tasks: debian_prerequisites.yml when: - ansible_os_family == 'Debian' - - container_package_name == 'docker-ce' tags: with_pkg # ensure extras enabled for docker -- 2.39.5