Merge pull request #2422 from riverzhang/patch-5

Enable OOM killing for etcd-events
2018-03-07 23:15:19 -06:00
parent 955f833120 388b627f72
commit 216bf2e867
1 changed files with 0 additions and 1 deletions
--- a/roles/etcd/templates/etcd-events.j2
+++ b/roles/etcd/templates/etcd-events.j2
@ -9,7 +9,6 @@
  {% if etcd_memory_limit is defined %}
  --memory={{ etcd_memory_limit|regex_replace('Mi', 'M') }} \
  {% endif %}
-  --oom-kill-disable \
  {% if etcd_cpu_limit is defined %}
  --cpu-shares={{ etcd_cpu_limit|regex_replace('m', '') }} \
  {% endif %}