diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-18 15:10:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 15:10:37 -0400 |
| commit | 8e2be54c6f2f55368f33667a68a5693dc75b1027 (patch) | |
| tree | 0f63035787dce728f9fa994a2dad78cff5bb9f0c /roles/docker | |
| parent | 742203529902ba278c213e326f81f667304b9625 (diff) | |
| parent | 5a94fe5b074d01a3b16db8a05c47c31e484e5ebe (diff) | |
| download | openshift-8e2be54c6f2f55368f33667a68a5693dc75b1027.tar.gz openshift-8e2be54c6f2f55368f33667a68a5693dc75b1027.tar.bz2 openshift-8e2be54c6f2f55368f33667a68a5693dc75b1027.tar.xz openshift-8e2be54c6f2f55368f33667a68a5693dc75b1027.zip | |
Merge pull request #4698 from sdodson/service-retries
Service retries
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/handlers/main.yml | 3 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 7 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index 3a4f4ba92..591367467 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -6,9 +6,8 @@ state: restarted register: r_docker_restart_docker_result until: not r_docker_restart_docker_result | failed - retries: 1 + retries: 3 delay: 30 - when: not docker_service_status_changed | default(false) | bool - name: restart udev diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index c82d8659a..5f536005d 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -123,9 +123,12 @@ enabled: yes state: started daemon_reload: yes - register: start_result + register: r_docker_package_docker_start_result + until: not r_docker_package_docker_start_result | failed + retries: 3 + delay: 30 - set_fact: - docker_service_status_changed: start_result | changed + docker_service_status_changed: "{{ r_docker_package_docker_start_result | changed }}" - meta: flush_handlers diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index d8c5ccfd3..57a84bc2c 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -46,6 +46,11 @@ state: stopped daemon_reload: yes ignore_errors: True + register: r_docker_systemcontainer_docker_stop_result + until: not r_docker_systemcontainer_docker_stop_result | failed + retries: 3 + delay: 30 + # Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf # regexp: the line starts with or without #, followed by the string @@ -160,9 +165,12 @@ enabled: yes state: started daemon_reload: yes - register: start_result + register: r_docker_systemcontainer_docker_start_result + until: not r_docker_systemcontainer_docker_start_result | failed + retries: 3 + delay: 30 - set_fact: - docker_service_status_changed: start_result | changed + docker_service_status_changed: "{{ r_docker_systemcontainer_docker_start_result | changed }}" - meta: flush_handlers |