Skip to content

Commit

Permalink
docker2podman: pull images from docker daemon
Browse files Browse the repository at this point in the history
The docker2podman playbook only installs the podman package and updates
the systemd units with the right container_binary value.

We never pull the container image so if one service is restarted then
the container image will be pulled first before the service can start
which could cause longer downstream.

To avoid to download the container image from internet again we can just
pull it from the local docker daemon.

The container_{binding,package,service}_name variables are removed
because they are only used in the ceph-container-engine role which
isn't call in this playbook.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit d38f21a)
  • Loading branch information
dsavineau committed Jun 3, 2020
1 parent 8c4865c commit 6f893e5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 11 deletions.
31 changes: 21 additions & 10 deletions infrastructure-playbooks/docker-to-podman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
- "{{ mgr_group_name | default('mgrs') }}"
- "{{ iscsi_gw_group_name | default('iscsigws') }}"
- "{{ rbdmirror_group_name | default('rbdmirrors') }}"
gather_facts: false
become: true
pre_tasks:
tasks:
- import_role:
name: ceph-defaults
- import_role:
Expand All @@ -68,26 +69,36 @@
set_fact:
ceph_docker_version: "{{ ceph_docker_version.stdout.split(' ')[2] }}"


tasks:
- name: set_fact container_binary, container_binding_name, container_service_name, container_package_name
- name: set_fact docker2podman and container_binary
set_fact:
docker2podman: True
container_binary: podman
container_binding_name: podman
container_service_name: podman
container_package_name: podman

- name: install podman
package:
name: podman
state: present
register: result
until: result is succeeded
tags:
- with_pkg
tags: with_pkg
when: not is_atomic | bool

- name: "pulling {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} image from docker daemon"
command: "{{ timeout_command }} {{ container_binary }} pull docker-daemon:{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
changed_when: false
register: pull_image
until: pull_image.rc == 0
retries: "{{ docker_pull_retry }}"
delay: 10
when: inventory_hostname in groups.get(mon_group_name, []) or
inventory_hostname in groups.get(osd_group_name, []) or
inventory_hostname in groups.get(mds_group_name, []) or
inventory_hostname in groups.get(rgw_group_name, []) or
inventory_hostname in groups.get(mgr_group_name, []) or
inventory_hostname in groups.get(rbdmirror_group_name, []) or
inventory_hostname in groups.get(iscsi_gw_group_name, []) or
inventory_hostname in groups.get(nfs_group_name, [])

- import_role:
name: ceph-mon
tasks_from: systemd.yml
Expand Down Expand Up @@ -133,6 +144,6 @@
tasks_from: systemd.yml
when: inventory_hostname in groups.get(rgw_group_name, [])

- name: reload ceph monitor systemd unit
- name: reload systemd daemon
systemd:
daemon_reload: yes
8 changes: 7 additions & 1 deletion tox-docker2podman.ini
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ commands=
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
"

ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/docker-to-podman.yml
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/docker-to-podman.yml --extra-vars "\
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
"

py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests

Expand Down

0 comments on commit 6f893e5

Please sign in to comment.