Merge pull request #2294 from Nowaker/patch-1

Enable OOM killing
2018-03-01 14:56:26 +01:00 · 2018-03-01 14:56:26 +01:00 · 5cc77eb6fd
commit 5cc77eb6fd
parent a1aa9d79c0 f8a59446e8
1 changed files with 0 additions and 1 deletions
--- a/roles/etcd/templates/etcd.j2
+++ b/roles/etcd/templates/etcd.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 %}