Run OOM with 7 Kubernetes host VMs

Bump helm to 2.8.2.
Bump kubectl to 1.8.10.
Remove obsolete HEAT parameters.

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

24 files changed, 42 insertions, 315 deletions

diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 1a9aa9a82..6e7c7c4df 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -1,33 +1,16 @@
 parameters:
 
-  keystone_url: http://192.168.1.11:5000
-  openstack_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
-  openstack_tenant_name: onap
-  openstack_username: demo
-  openstack_api_key: demo
-
   ubuntu_1404_image: trusty
   ubuntu_1604_image: xenial
-  centos_7_image: centos7
 
+  lab_name: gwu
   apt_proxy: 192.168.1.51:3142
   docker_proxy: 192.168.1.51:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
   public_net_name: provider
 
   oam_network_cidr: 172.16.0.0/16
-  dns_forwarder: 192.168.1.11
-  external_dns: 192.168.1.3
-
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v2.0"
-  dnsaas_keystone_url: http://192.168.1.11:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
-  dnsaas_tenant_name: onap
-  dnsaas_username: demo
-  dnsaas_password: demo
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 88d6b7492..98e909f70 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -1,33 +1,16 @@
 parameters:
 
-  keystone_url: http://10.145.122.117:5000
-  openstack_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
-  openstack_tenant_name: onap-beijing-oom
-  openstack_username: demo
-  openstack_api_key: demo
-
   ubuntu_1404_image: trusty
   ubuntu_1604_image: xenial
-  centos_7_image: centos7
 
+  lab_name: huawei
   apt_proxy: 10.145.122.118:3142
   docker_proxy: 10.145.122.118:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
   public_net_name: provider
 
   oam_network_cidr: 172.16.0.0/16
-  dns_forwarder: 10.145.122.117
-  external_dns: 10.145.122.118
-
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v2.0"
-  dnsaas_keystone_url: http://10.145.122.117:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
-  dnsaas_tenant_name: onap-beijing-oom
-  dnsaas_username: demo
-  dnsaas_password: demo
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index daa145a86..eb0afc41f 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96
-  openstack_tenant_name: ETE-HEAT-Test
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
   ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
   lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m2.large
-  k8s_vm_flavor: m5.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
   public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96
-  dnsaas_tenant_name: ETE-HEAT-Test
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index cbda112f7..eb0afc41f 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3
-  openstack_tenant_name: ETE-OOM-Test
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
   ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
   lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m2.large
-  k8s_vm_flavor: m5.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
   public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3
-  dnsaas_tenant_name: ETE-OOM-Test
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
index cb9244299..eb0afc41f 100644
--- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
+++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
@@ -1,33 +1,16 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e
-  openstack_tenant_name: EXTONAP_DEV
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
   ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
+  lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
   public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e
-  dnsaas_tenant_name: EXTONAP_DEV
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
diff --git a/deployment/heat/onap-oom/env/tlab/integration-override.yaml b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
index 87302c96d..c56d139e9 100644
--- a/deployment/heat/onap-oom/env/tlab/integration-override.yaml
+++ b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
@@ -52,23 +52,8 @@ aaf:
   enabled: true
 aai:
   enabled: true
-  # aai subchart image overrides
-  aai-champ:
-    image: onap/champ:1.2-STAGING-latest
-  aai-data-router:
-    image: onap/data-router:1.2-STAGING-latest
-  aai-modelloader:
-    image: onap/model-loader:1.2-STAGING-latest
-  aai-resources:
-    image: onap/aai-resources:1.2-STAGING-latest
-  aai-search-data:
-    image: onap/search-data-service:1.2-STAGING-latest
-  aai-sparky-be:
-    image: onap/sparky-be:1.2-STAGING-latest
-  aai-traveral:
-    image: onap/aai-traversal:1.2-STAGING-latest
 appc:
-  enabled: false
+  enabled: true
 clamp:
   enabled: true
 cli:
@@ -104,13 +89,13 @@ portal:
 robot:
   enabled: true
   #pullPolicy: Always
-#  config:
-    # openstack configuration
-#    openStackUserName: "demo"
-#    openStackRegion: "RegionOne"
-#    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-#    openStackServiceTenantName: "service"
-#    openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+  config:
+  # openstack configuration
+  openStackUserName: "gw3113"
+  openStackRegion: "RegionOne"
+  openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+  openStackServiceTenantName: "service"
+  openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
 sdc:
   enabled: true
 sdnc:
@@ -120,11 +105,11 @@ so:
   # so server configuration
   config:
     # openstack configuration
-    openStackUserName: "demo"
+    openStackUserName: "gw3113"
     openStackRegion: "RegionOne"
     openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
     openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
+    openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
 
 uui:
   enabled: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc
deleted file mode 120000
index ad2738819..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-Jenkins-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index ff2f4e063..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77
-  openstack_tenant_name: Integration-Jenkins
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: bf80d09fbc804b42b3bc727d6cf1fcbe
-  dnsaas_tenant_name: Integration-Jenkins
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
deleted file mode 120000
index f5d04b1f2..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-00-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
index 16965979f..e4fd54d4c 100755..100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 41d6d38489bd40b09ea8a6b6b852dcbd
-  openstack_tenant_name: Integration-SB-00
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m1.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: a813ac529c6d4b44a3308ed38bcd7480
-  dnsaas_tenant_name: Integration-SB-00
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
deleted file mode 120000
index 208d760eb..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-01-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
index cd9509607..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 087050388b204c73a3e418dd2c1fe30b
-  openstack_tenant_name: Integration-SB-01
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 4318a6c5788449cc97c88fd745b554b9
-  dnsaas_tenant_name: Integration-SB-01
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
deleted file mode 120000
index 814962e0d..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-02-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
index bc113a89d..53e26f017 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: ebb0ea7144004bacac1e39ff23105fa7
-  openstack_tenant_name: Integration-SB-02
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
-  oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 89fee629f5f044739fb64380be63b6da
-  dnsaas_tenant_name: Integration-SB-02
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  oam_network_cidr: 172.16.0.0/16
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc
deleted file mode 120000
index 10a7b0b16..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-03-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index e05143e8d..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: bc43d50ffcb84750bac0c1707a9a765b
-  openstack_tenant_name: Integration-SB-03
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 29fb1a7806e84d8fbc93fa3945f1e2a5
-  dnsaas_tenant_name: Integration-SB-03
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc
deleted file mode 120000
index cd1eeb5ad..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-04-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index 2c00ad630..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: d570c718cbc545029f40e50b75eb13df
-  openstack_tenant_name: Integration-SB-04
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 024b911be9514ed7885af0c6bf6f68c8
-  dnsaas_tenant_name: Integration-SB-04
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc
deleted file mode 120000
index 2210fcc34..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-05-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index 1a1bfa56a..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: b8ad3842ab3642f7bf3fbe4e4d3b9f86
-  openstack_tenant_name: Integration-SB-05
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: d4e1d9e89456490cb7213092086e5c66
-  dnsaas_tenant_name: Integration-SB-05
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc
deleted file mode 120000
index 850c25544..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-06-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index 184a21110..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 7fad299815104c0a8f90a8df80343f03
-  openstack_tenant_name: Integration-SB-06
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 2d7c6ec2cf9147fa974fa059b3673d7a
-  dnsaas_tenant_name: Integration-SB-06
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc
deleted file mode 120000
index 7e4a3af20..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-07-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index 8df843503..e4fd54d4c 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -1,34 +1,16 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 1e097c6713e74fd7ac8e4295e605ee1e
-  openstack_tenant_name: Integration-SB-07
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
   lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
-
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 885777d5e9074f31ad7801f9e6876b84
-  dnsaas_tenant_name: Integration-SB-07
-  dnsaas_username: demo
-  dnsaas_password: onapdemo