diff options
-rw-r--r-- | playbooks/adhoc/uninstall.yml | 2 | ||||
-rw-r--r-- | roles/openshift_node/handlers/main.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 30e0f05fd..cd569937c 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -74,7 +74,7 @@ - name: Remove flannel package action: "{{ ansible_pkg_mgr }} name=flannel state=absent" - when: openshift_use_flannel | default(false) | bool + when: openshift_use_flannel | default(false) | bool and not is_atomic | bool - shell: systemctl reset-failed changed_when: False diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml index df3f6ee65..b24f61569 100644 --- a/roles/openshift_node/handlers/main.yml +++ b/roles/openshift_node/handlers/main.yml @@ -2,6 +2,12 @@ - name: restart openvswitch service: name=openvswitch state=restarted when: not (ovs_service_status_changed | default(false) | bool) + notify: + - restart openvswitch pause + +- name: restart openvswitch pause + pause: seconds=15 + when: openshift.common.is_containerized | bool - name: restart node service: name={{ openshift.common.service_type }}-node state=restarted |