diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-11-02 10:07:11 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-11-02 10:07:11 -0300 |
| commit | 36ecf1707a18a1411e2057355028e6cb285197a4 (patch) | |
| tree | cc341f71bc3aecc0aa52224b0d4808a3da4ad7f7 /roles/openshift_node | |
| parent | c97858a6bc61251c02d2ca27172ebe87727b776a (diff) | |
| download | openshift-36ecf1707a18a1411e2057355028e6cb285197a4.tar.gz openshift-36ecf1707a18a1411e2057355028e6cb285197a4.tar.bz2 openshift-36ecf1707a18a1411e2057355028e6cb285197a4.tar.xz openshift-36ecf1707a18a1411e2057355028e6cb285197a4.zip | |
Deploy an OOM systemd override for openvswitch.
At recommendation of network team, more details in:
https://bugzilla.redhat.com/show_bug.cgi?id=1331590
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 19 | ||||
| -rw-r--r-- | roles/openshift_node/templates/openvswitch-avoid-oom.conf | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index 27c9b48f0..f722a6e69 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -24,11 +24,26 @@ notify: - restart openvswitch +# May be a temporary workaround. +# https://bugzilla.redhat.com/show_bug.cgi?id=1331590 +- name: Create OpenvSwitch service.d directory + file: path=/etc/systemd/system/openvswitch.service.d/ state=directory + when: openshift.common.use_openshift_sdn | default(true) | bool + +- name: Install OpenvSwitch service OOM fix + template: + dest: "/etc/systemd/system/openvswitch.service.d/01-avoid-oom.conf" + src: openvswitch-avoid-oom.conf + when: openshift.common.use_openshift_sdn | default(true) | bool + register: install_oom_fix_result + notify: + - restart openvswitch + - name: Install OpenvSwitch docker service file template: dest: "/etc/systemd/system/openvswitch.service" src: openvswitch.docker.service - when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool + when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | default(true) | bool notify: - restart openvswitch @@ -67,6 +82,6 @@ - name: Reload systemd units command: systemctl daemon-reload - when: openshift.common.is_containerized | bool and (install_node_result | changed or install_ovs_sysconfig | changed or install_node_dep_result | changed) + when: (openshift.common.is_containerized | bool and (install_node_result | changed or install_ovs_sysconfig | changed or install_node_dep_result | changed)) or install_oom_fix_result | changed notify: - restart node diff --git a/roles/openshift_node/templates/openvswitch-avoid-oom.conf b/roles/openshift_node/templates/openvswitch-avoid-oom.conf new file mode 100644 index 000000000..3229bc56b --- /dev/null +++ b/roles/openshift_node/templates/openvswitch-avoid-oom.conf @@ -0,0 +1,3 @@ +# Avoid the OOM killer for openvswitch and it's children: +[Service] +OOMScoreAdjust=-1000 |