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.
This commit is contained in:
parent
53e405dd42
commit
a5c36eedd8
2 changed files with 9 additions and 10 deletions
|
@ -1,12 +1,12 @@
|
||||||
- name: Install Docker pre-reqs
|
|
||||||
dnf:
|
|
||||||
name: "{{ docker_prereq_packages }}"
|
|
||||||
state: present
|
|
||||||
|
|
||||||
- name: Add repository
|
- name: Add repository
|
||||||
command: dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
|
yum_repository:
|
||||||
args:
|
file: docker-ce
|
||||||
warn: no
|
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
|
- name: Update cache
|
||||||
command: dnf makecache
|
command: dnf makecache
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
docker_prereq_packages:
|
docker_prereq_packages: []
|
||||||
- dnf-plugins-core
|
|
||||||
|
|
||||||
docker_packages:
|
docker_packages:
|
||||||
- docker-ce
|
- docker-ce
|
||||||
|
|
Loading…
Reference in a new issue