summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/heat/onap-oom/env/gwu/onap.env (renamed from test/ete/labs/gwu/onap-oom.env)31
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env (renamed from test/ete/labs/huawei/onap-oom.env)32
-rw-r--r--deployment/heat/onap-oom/k8s_vm_entrypoint.sh (renamed from test/ete/labs/huawei/k8s_vm_entrypoint.sh)0
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml (renamed from test/ete/labs/huawei/onap-oom.yaml)0
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh (renamed from test/ete/labs/huawei/rancher_vm_entrypoint.sh)0
5 files changed, 33 insertions, 30 deletions
diff --git a/test/ete/labs/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 6315267ef..1f3b9e5d7 100644
--- a/test/ete/labs/gwu/onap-oom.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -1,26 +1,25 @@
parameters:
- ##############################################
- # #
- # Parameters used across all ONAP components #
- # #
- ##############################################
-
- public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
- public_net_name: provider
- docker_proxy: 192.168.1.51:5000
- apt_proxy: 192.168.1.51:3142
- ubuntu_1404_image: trusty
- ubuntu_1604_image: xenial
- centos_7_image: centos7
+ keystone_url: http://192.168.1.11:5000
openstack_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
openstack_tenant_name: onap
openstack_username: demo
openstack_api_key: demo
- keystone_url: http://192.168.1.11:5000
+
+ ubuntu_1404_image: trusty
+ ubuntu_1604_image: xenial
+ centos_7_image: centos7
+
+ apt_proxy: 192.168.1.51:3142
+ docker_proxy: 192.168.1.51:5000
+
rancher_vm_flavor: m1.small
k8s_vm_flavor: m2.xxlarge
- dns_list: ["192.168.1.11", "192.168.1.3"]
- dns_forwarder: 192.168.1.11
+
+ public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
+ public_net_name: provider
+
oam_network_cidr: 172.16.0.0/16
dcae_ip_addr: 172.16.0.4
+ dns_list: ["192.168.1.11", "192.168.1.3"]
+ dns_forwarder: 192.168.1.11
diff --git a/test/ete/labs/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 423480fef..00f3bd2cb 100644
--- a/test/ete/labs/huawei/onap-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -1,21 +1,25 @@
parameters:
- ##############################################
- # #
- # Parameters used across all ONAP components #
- # #
- ##############################################
-
- public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
- docker_proxy: 10.145.122.118:5000
- apt_proxy: 10.145.122.118:3142
- dns_list: ["10.145.122.117", "10.145.122.118"]
- oam_network_cidr: 172.16.0.0/16
- ubuntu_1404_image: trusty
+ keystone_url: http://10.145.122.117:5000
openstack_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
- openstack_tenant_name: onap-ci-amsterdam-heat
+ openstack_tenant_name: onap-beijing-oom
openstack_username: demo
openstack_api_key: demo
- keystone_url: http://10.145.122.117:5000
+
+ ubuntu_1404_image: trusty
+ ubuntu_1604_image: xenial
+ centos_7_image: centos7
+
+ apt_proxy: 10.145.122.118:3142
+ docker_proxy: 10.145.122.118:5000
+
rancher_vm_flavor: m1.small
k8s_vm_flavor: m1.xxlarge
+
+ public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
+ public_net_name: provider
+
+ oam_network_cidr: 172.16.0.0/16
+ dcae_ip_addr: 172.16.0.4
+ dns_list: ["10.145.122.117", "10.145.122.118"]
+ dns_forwarder: 10.145.122.117
diff --git a/test/ete/labs/huawei/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index cae0f392b..cae0f392b 100644
--- a/test/ete/labs/huawei/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
diff --git a/test/ete/labs/huawei/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 5db534471..5db534471 100644
--- a/test/ete/labs/huawei/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
diff --git a/test/ete/labs/huawei/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index da1955446..da1955446 100644
--- a/test/ete/labs/huawei/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh