diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-10 13:47:51 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-07-18 12:03:15 -0400 |
| commit | a05fbeb6135864fedfb648644b06702ee1afea68 (patch) | |
| tree | 0960b7d68dd00d5daeed7d709c717914468edf3a /roles | |
| parent | b98dd4f1ac8582dbdee70128151f7e14c68c9b74 (diff) | |
| download | openshift-a05fbeb6135864fedfb648644b06702ee1afea68.tar.gz openshift-a05fbeb6135864fedfb648644b06702ee1afea68.tar.bz2 openshift-a05fbeb6135864fedfb648644b06702ee1afea68.tar.xz openshift-a05fbeb6135864fedfb648644b06702ee1afea68.zip | |
Wrap additional service changes in retries
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/docker/handlers/main.yml | 1 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 7 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_node/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/handlers/main.yml | 8 |
6 files changed, 30 insertions, 6 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index 6745f4302..591367467 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -8,7 +8,6 @@ until: not r_docker_restart_docker_result | failed 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..18e3fe749 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..7e861cb8e 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 diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml index 0d4af9f53..6b38da7f8 100644 --- a/roles/openshift_node/handlers/main.yml +++ b/roles/openshift_node/handlers/main.yml @@ -4,9 +4,14 @@ name: openvswitch state: restarted when: (not skip_node_svc_handlers | default(False) | bool) and not (ovs_service_status_changed | default(false) | bool) and openshift.common.use_openshift_sdn | bool + register: l_openshift_node_stop_openvswitch_result + until: not l_openshift_node_stop_openvswitch_result | failed + retries: 3 + delay: 30 notify: - restart openvswitch pause + - name: restart openvswitch pause pause: seconds=15 when: (not skip_node_svc_handlers | default(False) | bool) and openshift.common.is_containerized | bool diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 573051504..dd47d643b 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -120,6 +120,9 @@ state: started when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool register: ovs_start_result + until: not ovs_start_result | failed + retries: 3 + delay: 30 - set_fact: ovs_service_status_changed: "{{ ovs_start_result | changed }}" diff --git a/roles/openshift_node_upgrade/handlers/main.yml b/roles/openshift_node_upgrade/handlers/main.yml index c636f6fa3..110dfe5ce 100644 --- a/roles/openshift_node_upgrade/handlers/main.yml +++ b/roles/openshift_node_upgrade/handlers/main.yml @@ -1,7 +1,13 @@ --- - name: restart openvswitch - systemd: name=openvswitch state=restarted + systemd: + name: openvswitch + state: restarted when: (not skip_node_svc_handlers | default(False) | bool) and not (ovs_service_status_changed | default(false) | bool) and openshift.common.use_openshift_sdn | bool + register: l_openshift_node_upgrade_stop_openvswitch_result + until: not l_openshift_node_upgrade_stop_openvswitch_result | failed + retries: 3 + delay: 30 notify: - restart openvswitch pause |