diff options
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env (renamed from test/ete/labs/windriver/onap-openstack.env) | 4 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/ete/labs/windriver/onap-openstack.env b/test/ete/labs/windriver/onap-openstack-template.env index d7542c4e9..0604ac32d 100644 --- a/test/ete/labs/windriver/onap-openstack.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -44,7 +44,7 @@ parameters: openstack_username: gary_wu - openstack_api_key: SAMPLE + openstack_api_key: ${OS_PASSWORD} openstack_auth_method: password @@ -121,7 +121,7 @@ parameters: dcaeos_openstack_region: RegionOne dcaeos_openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77 dcaeos_openstack_username: gary_wu - dcaeos_openstack_password: SAMPLE + dcaeos_openstack_password: ${OS_PASSWORD} dcaeos_dcae_key_name: id_lji_onap dcaeos_dcae_pub_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' dcaeos_private_key: ' diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index 02943935d..5d488c1ca 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -13,5 +13,9 @@ openstack stack delete -y $STACKS STACK="ete-$(uuidgen | cut -c-8)" echo "New Stack Name: ${STACK}" + + +envsubst < ${WORKSPACE}/test/ete/labs/windriver/onap-openstack-template.env > ${WORKSPACE}/test/ete/labs/windriver/onap-openstack.env + openstack stack create -t ${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -e ${WORKSPACE}/test/ete/labs/windriver/onap-openstack.env $STACK |