diff options
Diffstat (limited to 'boot')
| -rwxr-xr-x | boot/dcae2_vm_init.sh | 68 | ||||
| -rw-r--r-- | boot/oof_vm_init.sh | 97 |
2 files changed, 157 insertions, 8 deletions
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh index 5fd2d663..350e95b7 100755 --- a/boot/dcae2_vm_init.sh +++ b/boot/dcae2_vm_init.sh @@ -21,6 +21,9 @@ # parameters: URL METHOD CURLOPTIONS EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA assemble_curl_command() { + export http_proxy="" + export https_proxy="" + local URL="$1" local METHOD="$2" local CURLOPTIONS="$3" @@ -51,6 +54,9 @@ assemble_curl_command() # parameters: URL METHOD expected_response_code EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA call_api_for_response_code() { + export http_proxy="" + export https_proxy="" + local CURLOPTIONS='-kIso /dev/null -w "%{http_code}"' read -r CMDF <<-END $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6") @@ -59,6 +65,9 @@ END } call_api_for_response_body() { + export http_proxy="" + export https_proxy="" + local CURLOPTIONS='-ksb' read -r CMDF <<-END $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6") @@ -66,7 +75,10 @@ END eval "$CMDF" } call_api_for_response_header() -{ +{ + export http_proxy="" + export https_proxy="" + local CURLOPTIONS='-ks -o /dev/null -D -' read -r CMDF <<-END $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6") @@ -74,7 +86,10 @@ END eval "$CMDF" } call_api_for_verbose() -{ +{ + export http_proxy="" + export https_proxy="" + local CURLOPTIONS='-kIv' read -r CMDF <<-END $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6") @@ -91,6 +106,9 @@ END # parameters: URL METHOD EXPECTED_RESP_CODE EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA wait_for_api() { + export http_proxy="" + export https_proxy="" + local RESP="$3" local ACTUALRESP ACTUALRESP=$(call_api_for_response_code "$1" "$2" "$3" "$4" "$5" "$6") @@ -105,7 +123,10 @@ wait_for_api() # Wait till a TCP port is open # parameters: HOST PORT wait_for_tcp_port() -{ +{ + export http_proxy="" + export https_proxy="" + local DEST="$1" local PORT="$2" while ! nc -z -w 1 "$DEST" "$PORT"; do @@ -119,6 +140,9 @@ wait_for_tcp_port() wait_for_aai_ready() { + export http_proxy="" + export https_proxy="" + # wait till A&AI up and ready local AAIHOST AAIHOST=$(cat /opt/config/aai1_ip_addr.txt) @@ -137,6 +161,9 @@ wait_for_aai_ready() wait_for_multicloud_ready() { + export http_proxy="" + export https_proxy="" + # wait till MultiCloud up and ready local MCHOST MCHOST=$(cat /opt/config/openo_ip_addr.txt) @@ -153,6 +180,9 @@ wait_for_multicloud_ready() register_multicloud_pod25dns_with_aai() { + export http_proxy="" + export https_proxy="" + # Register MultiCloud with A&AI local CLOUD_OWNER='pod25dns' local CLOUD_VERSION='titanium_cloud' @@ -227,7 +257,10 @@ EOL register_multicloud_pod25_with_aai() -{ +{ + export http_proxy="" + export https_proxy="" + # Register MultiCloud with A&AI local CLOUD_OWNER='pod25' local CLOUD_VERSION='titanium_cloud' @@ -315,6 +348,9 @@ EOL verify_multicloud_registration() { + export http_proxy="" + export https_proxy="" + local CLOUD_OWNER='pod25' local CLOUD_REGION local CLOUD_VERSION='titanium_cloud' @@ -346,6 +382,9 @@ verify_multicloud_registration() register_dns_zone_proxied_designate() { + export http_proxy="" + export https_proxy="" + local CLOUD_OWNER='pod25' local CLOUD_REGION local CLOUD_VERSION='titanium_cloud' @@ -428,6 +467,9 @@ register_dns_zone_proxied_designate() register_dns_zone_designate() { + export http_proxy="" + export https_proxy="" + local HEADER_CONTENT_TYPE_JSON="Content-Type: application/json" local HEADER_ACCEPT_JSON="Accept: application/json" local HEADER_TOKEN @@ -514,6 +556,9 @@ register_dns_zone_designate() delete_dns_zone() { + export http_proxy="" + export https_proxy="" + local CLOUD_OWNER='pod25' local CLOUD_REGION local CLOUD_VERSION='titanium_cloud' @@ -556,6 +601,9 @@ delete_dns_zone() list_dns_zone() { + export http_proxy="" + export https_proxy="" + local CLOUD_OWNER='pod25' local CLOUD_REGION local CLOUD_VERSION='titanium_cloud' @@ -626,7 +674,14 @@ DOCKER_VERSION=$(cat /opt/config/docker_version.txt) ZONE=$(cat /opt/config/rand_str.txt) MYFLOATIP=$(cat /opt/config/dcae_float_ip.txt) MYLOCALIP=$(cat /opt/config/dcae_ip_addr.txt) +HTTP_PROXY=$(cat /opt/config/http_proxy.txt) +HTTPS_PROXY=$(cat /opt/config/https_proxy.txt) +if [ $HTTP_PROXY != "no_proxy" ] +then + export http_proxy=$HTTP_PROXY + export https_proxy=$HTTPS_PROXY +fi # start docker image pulling while we are waiting for A&AI to come online docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO" @@ -752,6 +807,11 @@ if [[ $DEPLOYMENT_PROFILE == R2* ]]; then echo "Setup CloudifyManager and Registrator" ./setup.sh sleep 10 + + export http_proxy="" + export https_proxy="" + + ./register.sh echo "Bring up DCAE MIN service components for R2 use cases" diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh index bbb8d9b2..4654ffbb 100644 --- a/boot/oof_vm_init.sh +++ b/boot/oof_vm_init.sh @@ -1,11 +1,13 @@ #!/bin/bash + NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +CASS_MUSIC_IMAGE_VERSION=$(cat /opt/config/cass_version.txt) +MUSIC_IMAGE_VERSION=$(cat /opt/config/music_version.txt) HAS_IMAGE_VERSION=$(cat /opt/config/has_docker_version.txt) OSDF_IMAGE_VERSION=$(cat /opt/config/osdf_docker_version.txt) -MUSIC_URL=music.api.simpledemo.onap.org cd /opt/optf-has git pull @@ -13,18 +15,105 @@ git pull COND_CONF=/opt/optf-has/conductor.conf LOG_CONF=/opt/optf-has/log.conf -#Certification file for OOF-HAS -BUNDLE=/opt/optf-has/AAF_RootCA.cer +# Certification file for OOF-HAS AAI_cert=/usr/local/bin/AAF_RootCA.cer +BUNDLE=/opt/optf-has/AAF_RootCA.cer OSDF_IMG=${NEXUS_DOCKER_REPO}/onap/optf-osdf:${OSDF_IMAGE_VERSION} HAS_IMG=${NEXUS_DOCKER_REPO}/onap/optf-has:${HAS_IMAGE_VERSION} -# pull images from repo +# pull OOF images from repo docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull ${OSDF_IMG} docker pull ${HAS_IMG} +# Install MUSIC +# MUSIC parameters +CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:$CASS_MUSIC_IMAGE_VERSION +MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:$MUSIC_IMAGE_VERSION +TOMCAT_IMG=library/tomcat:8.5 +ZK_IMG=library/zookeeper:3.4 +WORK_DIR=/opt/optf-has +CASS_USERNAME=cassandra1 +CASS_PASSWORD=cassandra1 + +# pull MUSIC images +docker pull ${ZK_IMG} +docker pull ${TOMCAT_IMG} +docker pull ${CASS_IMG} +docker pull ${MUSIC_IMG} + +# create directory for music properties and logs +mkdir -p /opt/optf-has/music/properties +mkdir -p /opt/optf-has/music/logs + +# add music.properties file +cat > /opt/optf-has/music/properties/music.properties<<NEWFILE +my.id=0 +all.ids=0 +my.public.ip=localhost +all.public.ips=localhost + +####################################### + +# Optional current values are defaults + +####################################### +zookeeper.host=music-zk +cassandra.host=music-db +#music.ip=localhost +#debug=true +#music.rest.ip=localhost +#lock.lease.period=6000 +cassandra.user=cassandra1 +cassandra.password=cassandra1 + +# AAF Endpoint if using AAF +aaf.endpoint.url=https://aaf.api.simpledemo.onap.org +NEWFILE + +# Create Volume for mapping war file and tomcat +docker volume create music-vol + +# Create a network for all the containers to run in. +docker network create music-net + +# Start Cassandra +docker run -d --rm --name music-db --network music-net -p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" -e CASSUSER=${CASS_USERNAME} -e CASSPASS=${CASS_PASSWORD} ${CASS_IMG} + +# Start Music war +docker run -d --rm --name music-war -v music-vol:/app ${MUSIC_IMG} + +# Start Zookeeper +docker run -d --rm --name music-zk --network music-net -p "2181:2181" -p "2888:2888" -p "3888:3888" ${ZK_IMG} + +# Delay for Cassandra +sleep 20; + +# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped. +docker run -d --rm --name music-tomcat --network music-net -p "8080:8080" -v music-vol:/usr/local/tomcat/webapps -v ${WORK_DIR}/music/properties:/opt/app/music/etc:ro -v ${WORK_DIR}/music/logs:/opt/app/music/logs ${TOMCAT_IMG} + +# Connect tomcat to host bridge network so that its port can be seen. +docker network connect bridge music-tomcat; +sleep 6; +echo "Running onboarding curl command" +curl -X POST \ + http://localhost:8080/MUSIC/rest/v2/admin/onboardAppWithMusic \ + -H 'Cache-Control: no-cache' \ + -H 'Content-Type: application/json' \ + -H 'Postman-Token: 7d2839f4-b032-487a-8998-4d1b27a932d7' \ + -d '{ +"appname": "conductor", +"userId" : "conductor", +"isAAF" : false, +"password" : "c0nduct0r" +} +' +echo "Onboarding curl complete" + +# Get MUSIC url +MUSIC_URL=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat) + # Run OOF-HAS # Set A&AI and MUSIC url inside OOF-HAS conductor.conf sed -i "138 s%.*%server_url = https://aai.api.simpledemo.onap.org:8443/aai%" $COND_CONF |