X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Foof_vm_init.sh;h=7c1f2cc78637fc4206b9a60068b1ce23c2056a54;hb=70e0586b8de17723bed3e836d6cf08d1d9022e57;hp=e4dc2c8811d4d4cb83e9abc693a8284100661fa9;hpb=6332dd1866819033fbac2d6e3dbccb22be341c10;p=demo.git diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh index e4dc2c88..7c1f2cc7 100644 --- a/boot/oof_vm_init.sh +++ b/boot/oof_vm_init.sh @@ -1,8 +1,8 @@ #!/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) @@ -10,13 +10,13 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/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" @@ -31,12 +31,71 @@ 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 ${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 + +#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<