Clean up heat template env files

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

diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index fc59c48..c2ef403 100644 (file)
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: m1.xlarge
 
-  flavor_xxlarge: m1.xlarge # purposely use a smaller VM here to reduce RAM usage
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -54,8 +52,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://192.168.1.11/horizon
-
   keystone_url: http://192.168.1.11:5000
 
   cloud_env: RegionOne

diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index cff445c..900b087 100644 (file)
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: m1.xlarge
 
-  flavor_xxlarge: m1.2xlarge
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -54,8 +52,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://10.145.122.117/horizon
-
   keystone_url: http://10.145.122.117:5000
 
   cloud_env: RegionOne

diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index a75438f..b92221f 100644 (file)
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: m1.xlarge
 
-  flavor_xxlarge: m1.xlarge
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -54,8 +52,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: https://bdc1tlab01.research.att.com/horizon
-
   keystone_url: https://bdc1tlab01.research.att.com:5000
 
   cloud_env: openstack

diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 1dbcbc4..f094f65 100644 (file)
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: m1.xlarge
 
-  flavor_xxlarge: m1.xxlarge
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -54,8 +52,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://10.12.25.2/horizon
-
   keystone_url: http://10.12.25.2:5000
 
   cloud_env: openstack