From 8023c6dc20c205d445a5477646164a44d5f39dab Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Sat, 24 Oct 2020 13:00:51 -0600 Subject: [PATCH] Only purge docker when using podman If you define both the docker and podman services, during the upgrade the podman service nukes docker even if we have container_cli set to docker. This change skips docker purge if we're configured to use docker. Change-Id: Ib6db467f292d61299ecd9b0dff6c334028b80181 Related-Bug: #1901209 --- deployment/podman/podman-baremetal-ansible.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 718808d2f6..3a527ba702 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -178,7 +178,9 @@ outputs: block: *install_and_configure_podman post_upgrade_tasks: - name: Purge everything about Docker on the host - when: step|int == 3 + when: + - step|int == 3 + - container_cli == 'podman' block: - name: Check if docker has some data stat: