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/scripts/gen-onap-oom-yaml.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh')

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 a63365837..922c7ccb6 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -7,6 +7,12 @@ if [ -z "$WORKSPACE" ]; then
 fi
 PARTS_DIR=$WORKSPACE/deployment/heat/onap-oom/parts
 
+cat <<EOF
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
+EOF
+
 cat $PARTS_DIR/onap-oom-1.yaml
 
 cat <<EOF
@@ -25,10 +31,12 @@ cat <<EOF
           template:
             get_file: rancher_vm_entrypoint.sh
           params:
-            __lab_name__: { get_param: lab_name }
             __docker_proxy__: { get_param: docker_proxy }
             __apt_proxy__: { get_param: apt_proxy }
             __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+            __integration_override_yaml__: { get_param: integration_override_yaml }
+            __oam_network_id__: { get_resource: oam_network }
+            __oam_subnet_id__: { get_resource: oam_subnet }
             __k8s_vm_ips__: [
 EOF
 
-- 
cgit 1.2.3-korg