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 161238bcb..c048f356e 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