From 11c9874f6aa84e8f3ab03f9bec84c8b0c5033003 Mon Sep 17 00:00:00 2001 From: Gary Wu 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 --- deployment/heat/onap-oom/parts/onap-oom-1.yaml | 19 ++++++------------- deployment/heat/onap-oom/parts/onap-oom-2.yaml | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'deployment/heat/onap-oom/parts') diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index ef408b48e..e29f6cd81 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -2,9 +2,6 @@ heat_template_version: 2015-10-15 description: ONAP on Kubernetes using OOM parameters: - lab_name: - type: string - docker_proxy: type: string @@ -15,29 +12,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: diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml index cdc2247a1..7ee9021af 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml @@ -25,7 +25,6 @@ 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] } -- cgit 1.2.3-korg