diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index e6c3fe4d7..5437275a2 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -1,6 +1,6 @@  ---  - name: Get current installed Docker version -  command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker" +  command: "{{ repoquery_installed }} --qf '%{version}' docker"    when: not openshift.common.is_atomic | bool    register: curr_docker_version    retries: 4 @@ -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 | 
