X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Foof_vm_init.sh;h=fd654430b5571170fc9d84a625ae667f34f7cd77;hb=3f5434179d1721dc8f201b687910e9193ff38622;hp=d803330dfb973731787e6c9cc0f2a0ef87ddbafa;hpb=ba90f1a1067ba6a4ead26ae979dc482e446835ce;p=demo.git diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh index d803330d..fd654430 100644 --- a/boot/oof_vm_init.sh +++ b/boot/oof_vm_init.sh @@ -1,28 +1,32 @@ #!/bin/bash -CERT=/opt/optf-has/aai.cer -KEY=/opt/optf-has/aai.key -BUNDLE=/opt/optf-has/aai_bundle.pem +CERT=/opt/optf-has/aai_cert.cer +KEY=/opt/optf-has/aai_key.key +BUNDLE=/opt/optf-has/AAF_RootCA.cer 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) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.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) cd /opt/optf-has -#git pull +git pull COND_CONF=/opt/optf-has/conductor.conf LOG_CONF=/opt/optf-has/log.conf #!!! THE FOLLOWING LINE IS A PLACEHOLDER !!! -AAI_cert=/opt/optf-has/aai_cert.cer +AAI_cert=/usr/local/bin/AAF_RootCA.cer -IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has" +OSDF_IMG=${NEXUS_DOCKER_REPO}/onap/optf-osdf:${OSDF_IMAGE_VERSION} +HAS_IMG=${NEXUS_DOCKER_REPO}/onap/optf-has:${HAS_IMAGE_VERSION} # MUSIC parameters -CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:latest -MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:latest +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 @@ -31,61 +35,69 @@ CASS_PASSWORD=cassandra1 # pull images from repo docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/optf-osdf:$DOCKER_IMAGE_VERSION +docker pull ${OSDF_IMG} docker pull ${ZK_IMG} docker pull ${TOMCAT_IMG} docker pull ${CASS_IMG} docker pull ${MUSIC_IMG} -docker pull $NEXUS_DOCKER_REPO/onap/optf-has:$DOCKER_IMAGE_VERSION +docker pull ${HAS_IMG} #run optf-osdf -OSDF_IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-osdf" OSDF_CONFIG=/opt/optf-osdf/config/osdf_config.yaml +HAS_HOST=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' api) mkdir -p /opt/optf-osdf/config cat > $OSDF_CONFIG<