From 11c9874f6aa84e8f3ab03f9bec84c8b0c5033003 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 2 May 2018 16:19:04 -0700
Subject: Pass integration-override directly in env file

Change-Id: I5fddab2211fcaa1edbc91662222801499c610cfb
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'deployment/heat/onap-oom/k8s_vm_entrypoint.sh')

diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index 79d7db5cf..1ec659c0e 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -3,7 +3,9 @@ printenv
 
 mkdir -p /opt/config
 echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt
-echo `hostname -I` `hostname` >> /etc/hosts
+HOST_IP=$(hostname -I)
+echo $HOST_IP `hostname` >> /etc/hosts
+
 mkdir -p /etc/docker
 if [ ! -z "__docker_proxy__" ]; then
     cat > /etc/docker/daemon.json <<EOF
@@ -41,5 +43,6 @@ while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do
     mount /dockerdata-nfs
     sleep 5
 done
-source /dockerdata-nfs/rancher_agent_cmd.sh
-
+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
+source rancher_agent_cmd.sh
-- 
cgit 1.2.3-korg