diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-10-28 21:44:00 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-10-28 23:08:29 -0700 |
commit | 3fd6c2aac97baeb7e9a5d9f9d3a09fced70ddd37 (patch) | |
tree | c1589000a3ed90ee8336d2467da96ca6d3aa67a4 /deployment/heat/onap-oom/k8s_vm_entrypoint.sh | |
parent | e713bfc403c64f4612d7205ff6d9cf9db693add9 (diff) |
Enable k8s resiliency planes
Enable k8s resiliency planes and also reduce the number of
k8s compute hosts down to 12 x 16 GB.
Change-Id: I090495de2ac9986c0c85c19a503c44beca9e8fb6
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/k8s_vm_entrypoint.sh')
-rw-r--r-- | deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh index 6311dfbff..b93eab3f8 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh @@ -9,6 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +export DEBIAN_FRONTEND=noninteractive printenv mkdir -p /opt/config @@ -36,16 +37,13 @@ fi mkdir -p /dockerdata-nfs echo "__rancher_private_ip_addr__:/dockerdata-nfs /dockerdata-nfs nfs noauto,noatime,fg,retry=1,x-systemd.automount,_netdev,soft,nolock,intr,tcp,actimeo=1800 0 0" | tee -a /etc/fstab -# Fix virtual memory allocation for onap-log:elasticsearch: -echo "vm.max_map_count=262144" >> /etc/sysctl.conf -sysctl -p - # workaround for OpenStack intermittent failure to change default apt mirrors sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /etc/apt/sources.list while ! hash jq &> /dev/null; do apt-get -y update - apt-get -y install apt-transport-https ca-certificates curl software-properties-common linux-image-extra-$(uname -r) jq nfs-common + apt-get -y dist-upgrade + apt-get -y install linux-image-extra-$(uname -r) apt-transport-https ca-certificates curl software-properties-common jq nfs-common sleep 10 done @@ -55,6 +53,7 @@ while ! hash docker &> /dev/null; do usermod -aG docker ubuntu sleep 10 done +apt-mark hold docker-ce while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do mount /dockerdata-nfs @@ -63,5 +62,8 @@ done cd ~ cp /dockerdata-nfs/rancher_agent_cmd.sh . -sed -i "s/docker run/docker run -e CATTLE_AGENT_IP=${HOST_IP}/g" rancher_agent_cmd.sh +sed -i "s/docker run/docker run -e CATTLE_HOST_LABELS='__host_label__=true' -e CATTLE_AGENT_IP=${HOST_IP}/g" rancher_agent_cmd.sh source rancher_agent_cmd.sh +sleep 1m + +reboot |