Pass integration-override directly in env file

Change-Id: I5fddab2211fcaa1edbc91662222801499c610cfb
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

1 files changed, 12 insertions, 21 deletions

diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index aca3aa5dd..44bf799ff 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -1,10 +1,10 @@
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
 heat_template_version: 2015-10-15
 description: ONAP on Kubernetes using OOM
 
 parameters:
-  lab_name:
-    type: string
-
   docker_proxy:
     type: string
 
@@ -15,29 +15,25 @@ parameters:
     type: string
     description: The ID of the Public network for floating IP address allocation
 
-  public_net_name:
-    type: string
-    description: The name of the Public network referred by public_net_id
-
   oam_network_cidr:
     type: string
     description: CIDR of the OAM ONAP network
 
-  ubuntu_1404_image:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
   ubuntu_1604_image:
     type: string
     description: Name of the Ubuntu 16.04 image
 
   rancher_vm_flavor:
     type: string
-    description: Name of the Ubuntu 14.04 image
+    description: VM flavor for Rancher
 
   k8s_vm_flavor:
     type: string
-    description: Name of the Ubuntu 14.04 image
+    description: VM flavor for k8s hosts
+
+  integration_override_yaml:
+    type: string
+    description: Content for integration_override.yaml
 
 resources:
   random-str:
@@ -136,10 +132,12 @@ resources:
           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__: [
               get_attr: [k8s_1_floating_ip, floating_ip_address],
               get_attr: [k8s_2_floating_ip, floating_ip_address],
@@ -176,7 +174,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -210,7 +207,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -244,7 +240,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -278,7 +273,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -312,7 +306,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -346,7 +339,6 @@ resources:
       user_data:
         str_replace:
           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] }
@@ -380,7 +372,6 @@ resources:
       user_data:
         str_replace:
           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] }