From 385bc9700b9d917b0faa60bbcbb78f2311d3140b Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Tue, 1 Sep 2020 13:49:05 +1200
Subject: [PATCH] Update default values for docker nofile and vm.max_map_count

Task: 40801
Story: 2008098

Change-Id: I1802e4002d9aa89a321f130a16fd8021a773b73a
---
 .../configure_docker_storage_driver_fedora_coreos.sh          | 3 +++
 .../kubernetes/fragments/configure-kubernetes-minion.sh       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh b/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
index cca5497be8..e8b7a352cd 100644
--- a/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
+++ b/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
@@ -28,6 +28,9 @@ configure_storage_driver_generic() {
     fi
     if [ ${CONTAINER_RUNTIME} = "host-docker"  ] ; then
         sed -i -E 's/^OPTIONS=("|'"'"')/OPTIONS=\1--storage-driver='$1' /' /etc/sysconfig/docker
+        # NOTE(flwang): The default nofile limit it too low, update it to
+        # match the default value in containerd
+        sed -i -E 's/--default-ulimit nofile=1024:1024/--default-ulimit nofile=1048576:1048576/' /etc/sysconfig/docker
     fi
 }
 
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
index 37401ad0cb..2f47c43ef2 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -29,6 +29,10 @@ _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","opt
 
 if [ "$NETWORK_DRIVER" = "calico" ]; then
     echo "net.ipv4.conf.all.rp_filter = 1" >> /etc/sysctl.conf
+    # NOTE(flwang): The default value for vm.max_map_count is too low, update
+    # it to 262144 to meet the minium requirement of Elasticsearch
+    echo "vm.max_map_count = 262144" >> /etc/sysctl.conf
+
     $ssh_cmd sysctl -p
     if [ "$($ssh_cmd systemctl status NetworkManager.service | grep -o "Active: active")" = "Active: active" ]; then
         CALICO_NM=/etc/NetworkManager/conf.d/calico.conf