[stable-2.9] Simplify docker_setup on Fedora.

This avoids installing dnf-plugins-core, which breaks the yum and dnf modules
when uninstalling packages using a wildcard after they have already been removed.

This should resolve issues with the yum integration tests failing after docker tests run.
(cherry picked from commit a5c36eedd8)

Co-authored-by: Matt Clay <matt@mystile.com>
pull/66298/head
Matt Clay 6 years ago
parent df37d93754
commit 0e3573640b

@ -1,12 +1,12 @@
- name: Install Docker pre-reqs
dnf:
name: "{{ docker_prereq_packages }}"
state: present
- name: Add repository
command: dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
args:
warn: no
yum_repository:
file: docker-ce
name: docker-ce-stable
description: Docker CE Stable - $basearch
baseurl: https://download.docker.com/linux/fedora/$releasever/$basearch/stable
enabled: yes
gpgcheck: yes
gpgkey: https://download.docker.com/linux/fedora/gpg
- name: Update cache
command: dnf makecache

@ -1,5 +1,4 @@
docker_prereq_packages:
- dnf-plugins-core
docker_prereq_packages: []
docker_packages:
- docker-ce

Loading…
Cancel
Save