summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-30 10:35:55 -0500
committerGitHub <noreply@github.com>2016-11-30 10:35:55 -0500
commit161d6ce3976dbae137a5b90252fc9966734f7c15 (patch)
tree17acb009aaec787ef134ce63244e5bb64df98231 /roles
parente4e281fefdafd0ee5cadb11cae6c67a409c262ce (diff)
parent5c24cf417b08e0b427435d1bd5d27a4b03467092 (diff)
downloadopenshift-161d6ce3976dbae137a5b90252fc9966734f7c15.tar.gz
openshift-161d6ce3976dbae137a5b90252fc9966734f7c15.tar.bz2
openshift-161d6ce3976dbae137a5b90252fc9966734f7c15.tar.xz
openshift-161d6ce3976dbae137a5b90252fc9966734f7c15.zip
Merge pull request #2859 from dgoodwin/ovs-docker-restart
Cleanup ovs file and restart docker on every upgrade.
Diffstat (limited to 'roles')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py1
-rw-r--r--roles/openshift_node/handlers/main.yml6
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 95a9d668a..eb29848ff 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1309,6 +1309,7 @@ def get_openshift_version(facts):
# No need to run this method repeatedly on a system if we already know the
# version
+ # TODO: We need a way to force reload this after upgrading bits.
if 'common' in facts:
if 'version' in facts['common'] and facts['common']['version'] is not None:
return chomp_commit_offset(facts['common']['version'])
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index ebe584588..cb51416d4 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,14 +1,14 @@
---
- name: restart openvswitch
systemd: name=openvswitch state=restarted
- when: not (ovs_service_status_changed | default(false) | bool) and openshift.common.use_openshift_sdn | bool
+ 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
notify:
- restart openvswitch pause
- name: restart openvswitch pause
pause: seconds=15
- when: openshift.common.is_containerized | bool
+ when: (not skip_node_svc_handlers | default(False) | bool) and openshift.common.is_containerized | bool
- name: restart node
systemd: name={{ openshift.common.service_type }}-node state=restarted
- when: not (node_service_status_changed | default(false) | bool)
+ when: (not skip_node_svc_handlers | default(False) | bool) and not (node_service_status_changed | default(false) | bool)