From: Ruoyu Ying <ruoyu.ying@intel.com>
Date: Wed, 18 Jul 2018 03:39:52 +0000 (+0800)
Subject: Clean up script for OOF HEAT based deployment
X-Git-Tag: 1.3.0~103^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5da6658029af19d1ffbb700ef9d2b2575075c402;p=demo.git

Clean up script for OOF HEAT based deployment

Removed configuration for MUSIC, removed unused certification and fixed hard coded values

Change-Id: I665d3f40f1836ba448ad8ee59971be5debb304e5
Issue-ID: OPTFRA-300
Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
---

diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh
index fd654430..bbb8d9b2 100644
--- a/boot/oof_vm_init.sh
+++ b/boot/oof_vm_init.sh
@@ -1,16 +1,11 @@
 #!/bin/bash
 
-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)
-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
@@ -18,160 +13,19 @@ git pull
 COND_CONF=/opt/optf-has/conductor.conf
 LOG_CONF=/opt/optf-has/log.conf
 
-#!!! THE FOLLOWING LINE IS A PLACEHOLDER !!!
+#Certification file for OOF-HAS
+BUNDLE=/opt/optf-has/AAF_RootCA.cer
 AAI_cert=/usr/local/bin/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}
 
-# 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 images from repo
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull ${OSDF_IMG}
-docker pull ${ZK_IMG}
-docker pull ${TOMCAT_IMG}
-docker pull ${CASS_IMG}
-docker pull ${MUSIC_IMG}
 docker pull ${HAS_IMG}
 
-
-#run 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<<NEWFILE
-
-# Credentials for SO
-soUsername: ""   # SO username for call back.
-soPassword: ""   # SO password for call back.
-
-# Credentials for Conductor
-conductorUrl: http://$HAS_HOST:8091/v1/plans/
-conductorUsername: admin1
-conductorPassword: plan.15
-conductorPingWaitTime: 60  # seconds to wait before calling the conductor retry URL
-conductorMaxRetries: 30  # if we don't get something in 30 minutes, give up
-
-# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://policy.api.simpledemo.onap.org:8081/pdp/api/getConfig # Policy Dev platform URL
-policyPlatformEnv: TEST  # Environment for policy platform
-policyPlatformUsername: testpdp   # Policy platform username.
-policyPlatformPassword: alpha123   # Policy platform password.
-policyClientUsername: python   # For use with ClientAuth
-policyClientPassword: test   # For use with ClientAuth
-
-# Credentials for DMaaP
-messageReaderHosts: NA
-messageReaderTopic: NA
-messageReaderAafUserId: NA
-messageReaderAafPassword: NA
-
-# Credentials for SDC
-sdcUrl: NA
-sdcUsername: NA
-sdcPassword: NA
-sdcONAPInstanceID: NA
-
-# Credentials for the OOF placement service - Generic
-osdfPlacementUsername: test
-osdfPlacementPassword: testpwd
-
-# Credentials for the OOF placement service - SO
-osdfPlacementSOUsername: so_test
-osdfPlacementSOPassword: so_testpwd
-
-# Credentials for the OOF CM scheduling service - Generic
-osdfCMSchedulerUsername: test1
-osdfCMSchedulerPassword: testpwd1
-
-NEWFILE
-
-docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMG}
-
-# install MUSIC
-# 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)
-#MUSIC_URL=localhost
-
+# 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
 sed -i "141 s%.*%server_url_version = v13%" $COND_CONF
@@ -184,8 +38,6 @@ sed -i "153 s%.*%certificate_authority_bundle_file = $AAI_cert%" $COND_CONF
 
 
 echo "Values to data component"
-echo $CERT
-echo $KEY
 echo $BUNDLE
 
 # run optf-has
@@ -197,14 +49,14 @@ docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_
 
 docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
 
-docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${HAS_IMG} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
+docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${HAS_IMG} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
 
 sleep 10
 
 echo "Inserting healthcheck plan"
 
 curl -X POST \
-  http://localhost:8080/MUSIC/rest/v2/keyspaces/conductor/tables/plans/rows/ \
+  http://$MUSIC_URL:8080/MUSIC/rest/v2/keyspaces/conductor/tables/plans/rows/ \
   -H 'Cache-Control: no-cache' \
   -H 'Content-Type: application/json' \
   -H 'Postman-Token: 502781e8-d588-475d-b181-c2e26625ac95' \
@@ -234,3 +86,59 @@ curl -X POST \
 '
 
 echo "Healthcheck plan inserted"
+
+
+#run 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<<NEWFILE
+
+# Credentials for SO
+soUsername: ""   # SO username for call back.
+soPassword: ""   # SO password for call back.
+
+# Credentials for Conductor
+conductorUrl: http://$HAS_HOST:8091/v1/plans/
+conductorUsername: admin1
+conductorPassword: plan.15
+conductorPingWaitTime: 60  # seconds to wait before calling the conductor retry URL
+conductorMaxRetries: 30  # if we don't get something in 30 minutes, give up
+
+# Policy Platform -- requires ClientAuth, Authorization, and Environment
+policyPlatformUrl: http://policy.api.simpledemo.onap.org:8081/pdp/api/getConfig # Policy Dev platform URL
+policyPlatformEnv: TEST  # Environment for policy platform
+policyPlatformUsername: testpdp   # Policy platform username.
+policyPlatformPassword: alpha123   # Policy platform password.
+policyClientUsername: python   # For use with ClientAuth
+policyClientPassword: test   # For use with ClientAuth
+
+# Credentials for DMaaP
+messageReaderHosts: NA
+messageReaderTopic: NA
+messageReaderAafUserId: NA
+messageReaderAafPassword: NA
+
+# Credentials for SDC
+sdcUrl: NA
+sdcUsername: NA
+sdcPassword: NA
+sdcONAPInstanceID: NA
+
+# Credentials for the OOF placement service - Generic
+osdfPlacementUsername: test
+osdfPlacementPassword: testpwd
+
+# Credentials for the OOF placement service - SO
+osdfPlacementSOUsername: so_test
+osdfPlacementSOPassword: so_testpwd
+
+# Credentials for the OOF CM scheduling service - Generic
+osdfCMSchedulerUsername: test1
+osdfCMSchedulerPassword: testpwd1
+
+NEWFILE
+
+docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMG}