diff options
| author | Sam Doran <sdoran@redhat.com> | 2019-11-18 15:08:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 15:08:58 -0500 |
| commit | 6b2b876d438ce65f5d6536c940eb6ee917295430 (patch) | |
| tree | ea33dd43188e9aaaceebbc16b6bcc41952c37159 /test/integration/targets/setup_docker/tasks/Debian.yml | |
| parent | 163904fe37808a29b0e9af42e9efef8b7cb3c71f (diff) | |
| download | ansible-6b2b876d438ce65f5d6536c940eb6ee917295430.tar.gz | |
Make Docker and Podman play nice (#65009)
podman 1.4 now installs docker man pages. Add handler to remove docker packages to avoid test failure due to this conflict.
Adjust inventory_docker_swarm integration test
Add conditional to cleanup handlers to allow use of the setup_docker role without removing packages at the end of the play. The inventory_docker_swarm integration tests does its own cleanup.
Diffstat (limited to 'test/integration/targets/setup_docker/tasks/Debian.yml')
| -rw-r--r-- | test/integration/targets/setup_docker/tasks/Debian.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/integration/targets/setup_docker/tasks/Debian.yml b/test/integration/targets/setup_docker/tasks/Debian.yml index da81ac77b3..0ea2cb4be2 100644 --- a/test/integration/targets/setup_docker/tasks/Debian.yml +++ b/test/integration/targets/setup_docker/tasks/Debian.yml @@ -7,6 +7,7 @@ name: "{{ docker_prereq_packages }}" state: present update_cache: yes + notify: cleanup docker - name: Add gpg key shell: curl -fsSL https://download.docker.com/linux/ubuntu/gpg >key && apt-key add key |