summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-12 21:22:09 -0400
committerGitHub <noreply@github.com>2016-09-12 21:22:09 -0400
commite1ce7d7b305cf5dc2cd7077a462416155fc89be7 (patch)
treee2fbc6689f6a33dcf14e8a31ac0b2c77c48a34af
parent1fb9cf5a6ee6c05149722a2083801918c6686545 (diff)
parent9890ee74b5d2792b53ea052b4c9fafebda379678 (diff)
downloadopenshift-e1ce7d7b305cf5dc2cd7077a462416155fc89be7.tar.gz
openshift-e1ce7d7b305cf5dc2cd7077a462416155fc89be7.tar.bz2
openshift-e1ce7d7b305cf5dc2cd7077a462416155fc89be7.tar.xz
openshift-e1ce7d7b305cf5dc2cd7077a462416155fc89be7.zip
Merge pull request #2439 from abutcher/restart-openvswitch
Check for use_openshift_sdn when restarting openvswitch.
-rw-r--r--roles/openshift_node/handlers/main.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index b24f61569..34071964a 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,7 +1,7 @@
---
- name: restart openvswitch
service: name=openvswitch state=restarted
- when: not (ovs_service_status_changed | default(false) | bool)
+ when: not (ovs_service_status_changed | default(false) | bool) and openshift.common.use_openshift_sdn | bool
notify:
- restart openvswitch pause
@@ -12,4 +12,3 @@
- name: restart node
service: name={{ openshift.common.service_type }}-node state=restarted
when: not (node_service_status_changed | default(false) | bool)
-