Update env to match latest heat template

Change-Id: I46d4526b6b339cb409d0c5dc5cbe05cf5aa41048
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 b1b31ee..b18546f 100644 (file)
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -70,6 +70,7 @@ parameters:
   dns_list: ["10.12.25.5", "8.8.8.8"]
   external_dns: 8.8.8.8
   oam_network_cidr: 10.0.0.0/16
+  dns_forwarder: 10.12.25.5
 
   ### Private IP addresses ###
 
@@ -126,10 +127,9 @@ parameters:
   dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: ${OS_USERNAME}
   dnsaas_password: ${OS_PASSWORD}
+  dcae_domain: dcaeg2.onap.org
   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: 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
 MIIEowIBAAKCAQEA5aCoAR8f8ikVe+5a/NvK6mvsyvok2aaph91klFN73TYUmxDD\n