Merge pull request #2294 from Nowaker/patch-1

Enable OOM killing

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 %}