Refactored OOM heat template/env file locations

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

1 files changed, 0 insertions, 130 deletions

diff --git a/test/ete/labs/huawei/onap-oom.yaml b/test/ete/labs/huawei/onap-oom.yaml
deleted file mode 100644
index 5db534471..000000000
--- a/test/ete/labs/huawei/onap-oom.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-heat_template_version: 2015-10-15
-description: ONAP on Kubernetes using OOM
-
-parameters:
-  docker_proxy:
-    type: string
-
-  apt_proxy:
-    type: string
-
-  public_net_id:
-    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
-
-  dns_list:
-    type: comma_delimited_list
-    description: List of External DNS for OAM ONAP network
-
-  oam_network_cidr:
-    type: string
-    description: CIDR of the OAM ONAP network
-
-  keystone_url:
-    type: string
-    description: URL of OpenStack Keystone
-
-  openstack_tenant_id:
-    type: string
-    description: OpenStack tenant ID
-
-  openstack_tenant_name:
-    type: string
-    description: OpenStack tenant name (matching with the openstack_tenant_id)
-
-  openstack_username:
-    type: string
-    description: OpenStack username
-
-  openstack_api_key:
-    type: string
-    description: OpenStack password or API Key
-
-  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
-
-  centos_7_image:
-    type: string
-    description: the id/name of the CentOS 7 VM imange
-
-  rancher_vm_flavor:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
-  k8s_vm_flavor:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
-  dcae_ip_addr:
-    type: string
-
-  dns_forwarder:
-    type: string
-    description: the forwarder address for setting up ONAP's private DNS server
-
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-  rancher_vm:
-    type: OS::Nova::Server
-    properties:
-      name: rancher
-      image: xenial
-      flavor: { get_param: rancher_vm_flavor }
-      key_name: onap_key
-      networks:
-      - network: { get_param: public_net_id }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-          template:
-            get_file: rancher_vm_entrypoint.sh
-
-  k8s_vm:
-    type: OS::Nova::Server
-    properties:
-      name: k8s
-      image: xenial
-      flavor: { get_param: k8s_vm_flavor }
-      key_name: onap_key
-      networks:
-      - network: { get_param: public_net_id }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-            __rancher_ip_addr__: { get_attr: [rancher_vm, first_address] }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_tenant_name__: { get_param: openstack_tenant_name }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __public_net_id__: { get_param: public_net_id }
-            __public_net_name__: { get_param: public_net_name }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __centos_7_image__: { get_param: centos_7_image }
-            __keystone_url__: { get_param: keystone_url }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dns_list__: { get_param: [dns_list, 0] }
-            __dns_forwarder__: { get_param: dns_forwarder }
-          template:
-            get_file: k8s_vm_entrypoint.sh