diff options
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env | 45 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 9 |
2 files changed, 28 insertions, 26 deletions
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 0604ac32d..e5dcde17d 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -40,9 +40,9 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77 + openstack_tenant_id: ${OS_PROJECT_ID} - openstack_username: gary_wu + openstack_username: ${OS_USERNAME} openstack_api_key: ${OS_PASSWORD} @@ -90,11 +90,11 @@ parameters: clamp_ip_addr: 10.0.12.1 openo_ip_addr: 10.0.14.1 -# dcae_coll_float_ip: 10.12.0.32 -# dcae_db_float_ip: 10.12.0.24 -# dcae_hdp1_float_ip: 10.12.0.30 -# dcae_hdp2_float_ip: 10.12.0.33 -# dcae_hdp3_float_ip: 10.12.0.15 +# dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE +# dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE +# dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE +# dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE +# dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE ########################### # # @@ -104,7 +104,7 @@ parameters: # dcae_base_environment: 1-NIC-FLOATING-IPS - dcae_zone: ZONE +# dcae_zone: ZONE # dcae_state: STATE @@ -116,15 +116,18 @@ parameters: # dcae_code_version: 1.1.0 - dcaeos_cloud_env: openstack - dcaeos_keystone_url: http://10.12.25.2:5000/v2.0 - dcaeos_openstack_region: RegionOne - dcaeos_openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77 - dcaeos_openstack_username: gary_wu - 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: ' + dnsaas_config_enabled: false + dnsaas_region: RegionOne + dnsaas_tenant_id: ${OS_PROJECT_ID} + dnsaas_keystone_url: http://10.12.25.2:5000/v2.0 + dnsaas_username: ${OS_USERNAME} + dnsaas_password: ${OS_PASSWORD} + dcae_keystone_url: http://10.12.25.2:5000/v2.0 + dcae_centos_7_image: 3a1f7b58-e1ee-4693-a310-d6c40a405545 + dcae_security_group: 9efe6dba-0d32-467d-816d-70557fce6a8b + dcae_key_name: dcae-key + 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 SpBlV0ePhqtYTXfFDRfozIPO5DhUpUGxOY77EDFrrtbp8Symx9wHlyXdtYEdRseC\n @@ -152,12 +155,6 @@ acMVAoGBAJk4+VGPw1Z7NZbJiDRtdCOY1SZBqWXf1Mth6H8JFUGPLyTfFq1cGpN8\n +Odna/7rl4jCiiWrCJyob4F4DF0AE1t3lEa1XgWwDIdagnldH9e5z/psR3I/p1wv\n m3bZLBvlAVvCajosd/qeX0FkPGZlgk1dGZ8/7SyK7NITqAfgMMRS\n -----END RSA PRIVATE KEY-----' - dcaeos_openstack_private_network_name: dcae-internal - dcaeos_public_net_id: external - dcaeos_ubuntu_1604_image: 01661c27-7637-46ee-97c0-55efdfe4d098 - dcaeos_centos_7_image: 3a1f7b58-e1ee-4693-a310-d6c40a405545 - dcaeos_security_group: 9efe6dba-0d32-467d-816d-70557fce6a8b - dcaeos_flavor_id: 7b5045c9-1887-4993-a9ab-735b751bbc3f ################################ # # @@ -171,7 +168,7 @@ m3bZLBvlAVvCajosd/qeX0FkPGZlgk1dGZ8/7SyK7NITqAfgMMRS\n mr_branch: master dcae_branch: master policy_branch: master - portal_branch: master + portal_branch: release-1.3.0 robot_branch: master sdc_branch: master sdnc_branch: master diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index 5d488c1ca..69296ab17 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -8,13 +8,18 @@ source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh # Delete all existing stacks STACKS=$(openstack stack list -c "Stack Name" -f value) -echo "Deleting Stacks ${STACKS}" -openstack stack delete -y $STACKS +if [ ! -z "${STACKS}" ]; then + echo "Deleting Stacks ${STACKS}" + openstack stack delete -y $STACKS +else + echo "No existing stacks to delete." +fi STACK="ete-$(uuidgen | cut -c-8)" echo "New Stack Name: ${STACK}" +cp ${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.env ${WORKSPACE}/test/ete/labs/windriver/onap-openstack-demo.env 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 |