Merge "Updated setup.sh and test1.robot"
diff --git a/bootstrap/vagrant-onap/README.md b/bootstrap/vagrant-onap/README.md
index 7a3641e..b0e1ee2 100644
--- a/bootstrap/vagrant-onap/README.md
+++ b/bootstrap/vagrant-onap/README.md
@@ -56,7 +56,7 @@
| multicloud | Multi Cloud |
| ccsdk | Common Controller SDK |
| vnfsdk | VNF SDK |
-| vpp | VNF Validation Program |
+| vvp | VNF Validation Program |
| all_in_one | All ONAP services in a VM |
| testing | Unit Test VM |
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 025e2bf..b1b31ee 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -124,8 +124,8 @@
dnsaas_region: RegionOne
dnsaas_keystone_url: http://10.12.25.5:5000/v3
dnsaas_tenant_name: ${OS_PROJECT_NAME}
- dnsaas_username: demo
- dnsaas_password: onapdemo
+ dnsaas_username: ${OS_USERNAME}
+ dnsaas_password: ${OS_PASSWORD}
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