From 62cbb515afecb64f889ee0eeb40c7f9e30f34a8d Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Mon, 11 Jul 2016 11:00:22 +0300 Subject: [PATCH] [K8s] Update dib elements to support debian image Change-Id: I1a2eee8c163cc8c54b81d9ca5bad4b22f9ad41b6 --- .../elements/kubernetes/install.d/57-kubernetes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Kubernetes/KubernetesCluster/elements/kubernetes/install.d/57-kubernetes b/Kubernetes/KubernetesCluster/elements/kubernetes/install.d/57-kubernetes index b89b236..f084be5 100755 --- a/Kubernetes/KubernetesCluster/elements/kubernetes/install.d/57-kubernetes +++ b/Kubernetes/KubernetesCluster/elements/kubernetes/install.d/57-kubernetes @@ -66,3 +66,11 @@ chmod +x /usr/local/bin/confd mkdir -p /etc/confd/{conf.d,templates} popd + +if [[ $(lsb_release -c -s) == 'jessie' ]]; then + #Enable cgroup memory if Debian 8 is used. Required by k8s since 1.2 + echo 'GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"' >> /etc/default/grub + + #Do not start haproxy on vm boot + systemctl disable haproxy +fi