Update heat template env for DCAE changes

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

diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 8619cad..025e2bf 100644 (file)
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -8,6 +8,8 @@ parameters:
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
 
+  public_net_name: external
+
   ubuntu_1404_image: ubuntu-14-04-cloud-amd64
 
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
@@ -42,6 +44,8 @@ parameters:
 
   openstack_tenant_id: ${OS_PROJECT_ID}
 
+  openstack_tenant_name: ${OS_PROJECT_NAME}
+
   openstack_username: ${OS_USERNAME}
 
   openstack_api_key: ${OS_PASSWORD}
@@ -118,13 +122,13 @@ parameters:
 
   dnsaas_config_enabled: true
   dnsaas_region: RegionOne
-  dnsaas_tenant_id: DCAE
   dnsaas_keystone_url: http://10.12.25.5:5000/v3
+  dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: demo
   dnsaas_password: onapdemo
   dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
   dcae_centos_7_image: CentOS-7
-  dcae_security_group: open
+  dcae_security_group: default
   dcae_key_name: 'id_lji_onap'
   dcae_public_key:  'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDloKgBHx/yKRV77lr828rqa+zK+iTZpqmH3WSUU3vdNhSbEMNKkGVXR4+Gq1hNd8UNF+jMg87kOFSlQbE5jvsQMWuu1unxLKbH3AeXJd21gR1Gx4KXjkWsfl4URWMZ9WNvH0hMvqEV5SdFIDQmx07C/NOfy3R5N1pCgNsh9RT+EpDFh7jmimxrAqdxP0HnGFC2oM3rYMnzfh2/+Obkag6O3RZOkYx/WLQKbOKTi8K1C4UM5pwFzLT/vC+d9DF8pE7P9dlrbHTF9c3IGsP5oCa8CQ/WE4lVj/L9/iFNs0WsxdYaOnf11GJmPs663hltvWbQiqsFpdjX6tk/zMb3Xipz ubuntu@lusheng-sm-b781d54e-48ac-42fa-a780-3289b56e6598'
   dcae_private_key:  '-----BEGIN RSA PRIVATE KEY-----\n