summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-23 13:44:36 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-05-23 13:44:36 -0700
commit8053f360cab41003739bb3023b63027aa4cb60be (patch)
tree7ae8841da27b4dd3a59019ef25e449020583ec75
parent268b74dd31537e675aee6291a28c64f0d445e52c (diff)
Clean up heat template env files
Change-Id: I34ffb9b13b0b5f90733e1b37def051c0132ee9ac Issue-ID: INT-505 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--test/ete/labs/gwu/onap-openstack-template.env4
-rw-r--r--test/ete/labs/huawei/onap-openstack-template.env4
-rw-r--r--test/ete/labs/tlab/onap-openstack-template.env4
-rw-r--r--test/ete/labs/windriver/onap-openstack-template.env4
4 files changed, 0 insertions, 16 deletions
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index fc59c48e8..c2ef4034a 100644
--- 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 cff445c93..900b08789 100644
--- 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 a75438f7a..b92221f43 100644
--- 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 1dbcbc4f6..f094f65a9 100644
--- 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