From 1b720085f2448794190e224011a07134b9425310 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 5 May 2016 12:29:10 -0300 Subject: Fixed openvswitch not upgrading. Problem was a missing restart as systemd file did not change, so no notification was triggered. Added a notification on a file that contains the image version which does change. This exposed a bug where openvswitch shuts down the node and you return to no functioning nodes. Fixed by reordering the handlers so openvswitch restarts first. --- roles/openshift_node/handlers/main.yml | 7 ++++--- roles/openshift_node/tasks/systemd_units.yml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'roles/openshift_node') diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml index 1a1dc8ede..df3f6ee65 100644 --- a/roles/openshift_node/handlers/main.yml +++ b/roles/openshift_node/handlers/main.yml @@ -1,8 +1,9 @@ --- +- name: restart openvswitch + service: name=openvswitch state=restarted + when: not (ovs_service_status_changed | default(false) | bool) + - name: restart node service: name={{ openshift.common.service_type }}-node state=restarted when: not (node_service_status_changed | default(false) | bool) -- name: restart openvswitch - service: name=openvswitch state=restarted - when: not (ovs_service_status_changed | default(false) | bool) diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index be4b4ed61..f3262803a 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -14,6 +14,8 @@ dest: /etc/sysconfig/openvswitch when: openshift.common.is_containerized | bool register: install_ovs_sysconfig + notify: + - restart openvswitch - name: Install OpenvSwitch docker service file template: -- cgit v1.2.3