diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-22 16:37:43 +0100 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-22 16:38:17 +0100 |
| commit | e4db872a66bdb41f6c45b7a3235d09a439c08936 (patch) | |
| tree | f233f8dd5af8b734c4a6ed6ca548eb9a33c88f79 /roles | |
| parent | e3a0867b67b3f83e1077f112f07ecbaf8236e173 (diff) | |
| download | openshift-e4db872a66bdb41f6c45b7a3235d09a439c08936.tar.gz openshift-e4db872a66bdb41f6c45b7a3235d09a439c08936.tar.bz2 openshift-e4db872a66bdb41f6c45b7a3235d09a439c08936.tar.xz openshift-e4db872a66bdb41f6c45b7a3235d09a439c08936.zip | |
Workaround the fact that package state=present with dnf fails for already installed but excluded packages.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index 06ba36d59..5437275a2 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -33,9 +33,10 @@ # Make sure Docker is installed, but does not update a running version. # Docker upgrades are handled by a separate playbook. +# Note: The curr_docker_version.stdout check can be removed when https://github.com/ansible/ansible/issues/33187 gets fixed. - name: Install Docker package: name=docker{{ '-' + docker_version if docker_version is defined else '' }} state=present - when: not openshift.common.is_atomic | bool + when: not openshift.common.is_atomic | bool and not curr_docker_version | skipped and not curr_docker_version.stdout != '' - block: # Extend the default Docker service unit file when using iptables-services |