diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-19 16:17:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 16:17:50 -0700 |
| commit | 483f5676fd51a906354014c5c202001d2dea306e (patch) | |
| tree | a2c12a3655e257c20d5f776d61e22724e5b00362 | |
| parent | a01ee6767c673fe2ee144eb851a5488fcf40f2ec (diff) | |
| parent | 5fb010d35a41336731e555a418245311dc4a21a9 (diff) | |
| download | openshift-483f5676fd51a906354014c5c202001d2dea306e.tar.gz openshift-483f5676fd51a906354014c5c202001d2dea306e.tar.bz2 openshift-483f5676fd51a906354014c5c202001d2dea306e.tar.xz openshift-483f5676fd51a906354014c5c202001d2dea306e.zip | |
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
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml | 4 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml index b2a2eac9a..52345a9ba 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml +++ b/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 diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index d685d77f2..16aea5067 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/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 |