summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-06 12:13:38 -0400
committerScott Dodson <sdodson@redhat.com>2017-07-18 12:03:15 -0400
commitb98dd4f1ac8582dbdee70128151f7e14c68c9b74 (patch)
tree9c8f9c3211dd29204ef6a90812dd713557e8e662
parent36a7c5bf5c69511020c516a33ca6b3e57aff485d (diff)
downloadopenshift-b98dd4f1ac8582dbdee70128151f7e14c68c9b74.tar.gz
openshift-b98dd4f1ac8582dbdee70128151f7e14c68c9b74.tar.bz2
openshift-b98dd4f1ac8582dbdee70128151f7e14c68c9b74.tar.xz
openshift-b98dd4f1ac8582dbdee70128151f7e14c68c9b74.zip
Wrap docker stop in retries
-rw-r--r--playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml8
-rw-r--r--roles/openshift_node_upgrade/tasks/docker/upgrade.yml8
2 files changed, 14 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml
index 17f8fc6e9..35d000e49 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml
@@ -32,7 +32,13 @@
- debug: var=docker_image_count.stdout
when: docker_upgrade_nuke_images is defined and docker_upgrade_nuke_images | bool
-- service: name=docker state=stopped
+- service:
+ name: docker
+ state: stopped
+ register: l_pb_docker_upgrade_stop_result
+ until: not l_pb_docker_upgrade_stop_result | failed
+ retries: 3
+ delay: 30
- name: Upgrade Docker
package: name=docker{{ '-' + docker_version }} state=present
diff --git a/roles/openshift_node_upgrade/tasks/docker/upgrade.yml b/roles/openshift_node_upgrade/tasks/docker/upgrade.yml
index 416cf605a..ebe87d6fd 100644
--- a/roles/openshift_node_upgrade/tasks/docker/upgrade.yml
+++ b/roles/openshift_node_upgrade/tasks/docker/upgrade.yml
@@ -26,7 +26,13 @@
- debug: var=docker_image_count.stdout
when: docker_upgrade_nuke_images is defined and docker_upgrade_nuke_images | bool
-- service: name=docker state=stopped
+- service:
+ name: docker
+ state: stopped
+ register: l_openshift_node_upgrade_docker_stop_result
+ until: not l_openshift_node_upgrade_docker_stop_result | failed
+ retries: 3
+ delay: 30
- name: Upgrade Docker
package: name=docker{{ '-' + docker_version }} state=present