Merge pull request #5464 from sosiouxme/20170919-repoquery-bz1482551

Automatic merge from submit-queue

repoquery bz1482551 followup

Adding retries on the repoqueries I missed in https://github.com/openshift/openshift-ansible/pull/5401

playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml

@@ -18,12 +18,16 @@
 - name: Get current version of Docker
   command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker"
   register: curr_docker_version
+  retries: 4
+  until: curr_docker_version | succeeded
   changed_when: false
 
 - name: Get latest available version of Docker
   command: >
     {{ repoquery_cmd }} --qf '%{version}' "docker"
   register: avail_docker_version
+  retries: 4
+  until: avail_docker_version | succeeded
   # Don't expect docker rpm to be available on hosts that don't already have it installed:
   when: pkg_check.rc == 0
   failed_when: false

roles/docker/tasks/package_docker.yml

@@ -4,7 +4,7 @@
   when: not openshift.common.is_atomic | bool
   register: curr_docker_version
   retries: 4
-  until: not curr_docker_version | failed
+  until: curr_docker_version | succeeded
   changed_when: false
 
 - name: Error out if Docker pre-installed but too old