From: Yang Xu Date: Sun, 18 Nov 2018 03:01:28 +0000 (+0000) Subject: Merge "Put VID staging back to 3.2-STAGING-latest" X-Git-Tag: 4.0.0-ONAP~344 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8e06d4c205b396f49d1f29e97f47c9c94386f52a;hp=37166121fa549f62bf9bde3aecac384059244b4a;p=integration.git Merge "Put VID staging back to 3.2-STAGING-latest" --- 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 <