From 5dac73aeeebf06e6a53a3d269b522c80d50b716c Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Sat, 17 Nov 2018 17:14:38 -0800 Subject: Add mtu parameter to OOM heat template Change-Id: Ia478de1f3484fa9b32fe34cf0ec8a5defe118f2e Issue-ID: INT-586 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/k8s_vm_install.sh | 8 ++++++++ deployment/heat/onap-oom/onap-oom.yaml | 22 ++++++++++++++++++++++ deployment/heat/onap-oom/parts/onap-oom-1.yaml | 4 ++++ deployment/heat/onap-oom/parts/onap-oom-2.yaml | 1 + deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 11 +++++++++-- .../heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 1 + 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/deployment/heat/onap-oom/k8s_vm_install.sh b/deployment/heat/onap-oom/k8s_vm_install.sh index e5b843e5d..3e80f8ea0 100644 --- a/deployment/heat/onap-oom/k8s_vm_install.sh +++ b/deployment/heat/onap-oom/k8s_vm_install.sh @@ -16,14 +16,22 @@ echo "__docker_version__" > /opt/config/docker_version.txt echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt echo "__rancher_private_ip_addr__" > /opt/config/rancher_private_ip_addr.txt echo "__host_private_ip_addr__" > /opt/config/host_private_ip_addr.txt +echo "__mtu__" > /opt/config/mtu.txt mkdir -p /etc/docker if [ ! -z "__docker_proxy__" ]; then cat > /etc/docker/daemon.json < /etc/docker/daemon.json < /etc/apt/apt.conf.d/30proxy < /opt/config/rancher_agent_version.txt echo "__kubectl_version__" > /opt/config/kubectl_version.txt echo "__helm_version__" > /opt/config/helm_version.txt echo "__helm_deploy_delay__" > /opt/config/helm_deploy_delay.txt +echo "__mtu__" > /opt/config/mtu.txt cat < /opt/config/integration-override.yaml __integration_override_yaml__ @@ -50,14 +51,20 @@ sed -i 's/\_\_docker_proxy__/__docker_proxy__/g' /opt/config/integration-overrid cp /opt/config/integration-override.yaml /root cat /root/integration-override.yaml -echo `hostname -I` `hostname` >> /etc/hosts mkdir -p /etc/docker if [ ! -z "__docker_proxy__" ]; then cat > /etc/docker/daemon.json < /etc/docker/daemon.json < /etc/apt/apt.conf.d/30proxy< project.json diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index b9e4f10bb..61d5f9f70 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -63,6 +63,7 @@ cat <