summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-24 10:31:58 -0500
committerGitHub <noreply@github.com>2017-03-24 10:31:58 -0500
commit4444a6ff2b1885b35a190e1f5e9a0f3a26ad4dfb (patch)
tree7a5d111c7f026c1ff4dc94eb1c18e09a4b4af2fb /roles
parent2d1f47412ecadf337045b51e7d0288ba9bca9a96 (diff)
parent04c70675e86ed60428ae7ca42bee22a759c5014c (diff)
downloadopenshift-4444a6ff2b1885b35a190e1f5e9a0f3a26ad4dfb.tar.gz
openshift-4444a6ff2b1885b35a190e1f5e9a0f3a26ad4dfb.tar.bz2
openshift-4444a6ff2b1885b35a190e1f5e9a0f3a26ad4dfb.tar.xz
openshift-4444a6ff2b1885b35a190e1f5e9a0f3a26ad4dfb.zip
Merge pull request #3747 from sdodson/BZ1420636
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node_upgrade/tasks/main.yml20
1 files changed, 12 insertions, 8 deletions
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml
index f052ed505..6ae8dbc12 100644
--- a/roles/openshift_node_upgrade/tasks/main.yml
+++ b/roles/openshift_node_upgrade/tasks/main.yml
@@ -51,24 +51,28 @@
failed_when: false
when: openshift.common.is_containerized | bool
+- name: Stop rpm based services
+ service:
+ name: "{{ item }}"
+ state: stopped
+ with_items:
+ - "{{ openshift.common.service_type }}-node"
+ - openvswitch
+ failed_when: false
+ when: not openshift.common.is_containerized | bool
+
- name: Upgrade openvswitch
package:
name: openvswitch
state: latest
- register: ovs_pkg
when: not openshift.common.is_containerized | bool
- name: Restart openvswitch
systemd:
- name: "{{ item }}"
- state: restarted
- with_items:
- - ovs-vswitchd
- - ovsdb-server
- - openvswitch
+ name: openvswitch
+ state: started
when:
- not openshift.common.is_containerized | bool
- - ovs_pkg | changed
# Mandatory Docker restart, ensure all containerized services are running:
- include: docker/restart.yml