Merge "Register WF Designer UI Service to MSB"

diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index d0cdf83..7f66e4e 100644 (file)
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -124,9 +124,9 @@ vid.api.simpledemo.onap.org.        IN      CNAME   vm1.vid.simpledemo.onap.org.
 portal.api.simpledemo.onap.org.        IN      CNAME   vm1.portal.simpledemo.onap.org.
 
 ;Message Router
-;mr.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.     
+mr.api.simpledemo.onap.org.    IN      CNAME   vm1.mr.simpledemo.onap.org.     
 ueb.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
-;dbc.api.simpledemo.onap.org.  IN      CNAME   vm1.mr.simpledemo.onap.org.
+dbc.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
 ;drprov.api.simpledemo.onap.org.       IN      CNAME   vm1.mr.simpledemo.onap.org.
 
 ;CLAMP
@@ -154,4 +154,4 @@ music.api.simpledemo.onap.org.      IN      CNAME   vm1.music.simpledemo.onap.org.
 oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
 
 ;NBI
-nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.
\ No newline at end of file
+nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.

diff --git a/boot/dbcl_serv.sh b/boot/dbcl_serv.sh
new file mode 100644 (file)
index 0000000..dfb7020
--- /dev/null
+++ b/boot/dbcl_serv.sh
@@ -0,0 +1,116 @@
+
+#############################################################################
+#
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#############################################################################
+
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+dir="/opt"
+cmd="./dbcl_vm_init.sh"
+user="root"
+
+name=`basename $0`
+pid_file="/var/run/$name.pid"
+stdout_log="/var/log/$name.log"
+stderr_log="/var/log/$name.err"
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+case "$1" in
+    start)
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name"
+        cd "$dir"
+        if [ -z "$user" ]; then
+            sudo $cmd >> "$stdout_log" 2>> "$stderr_log" &
+        else
+            sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
+        fi
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start, see $stdout_log and $stderr_log"
+            exit 1
+        fi
+    fi
+    ;;
+    stop)
+    if is_running; then
+        echo -n "Stopping $name.."
+        kill `get_pid`
+        for i in {1..10}
+        do
+            if ! is_running; then
+                break
+            fi
+
+            echo -n "."
+            sleep 1
+        done
+        echo
+
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            exit 1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+    fi
+    ;;
+    restart)
+    $0 stop
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        exit 1
+    fi
+    $0 start
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        exit 1
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
+
+exit 0

diff --git a/boot/dbcl_vm_init.sh b/boot/dbcl_vm_init.sh
new file mode 100644 (file)
index 0000000..ba9859a
--- /dev/null
+++ b/boot/dbcl_vm_init.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+# Establish environment variables
+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/uui_docker.txt)
+
+# Refresh images
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION onap/dmaap/buscontroller:latest
+
+docker rm -f dmaap-buscontroller
+
+TMP_CFG=/tmp/docker-dmaap-buscontroller.conf
+cat >> $TMP_CFG <<!EOF
+DMAAPBC_INT_HTTPS_PORT=0
+DMAAPBC_PG_ENABLED=false
+DMAAPBC_INSTANCE_NAME=ONAP-CSIT
+DMAAPBC_AAF_URL=https://aaf.api.simpledemo.onap.org:8095/proxy/
+DMAAPBC_MR_CNAME=mr.api.simpledemo.onap.org
+DMAAPBC_DRPROV_FQDN=drprov.simpledemo.onap.org
+!EOF
+
+# Insert docker run instructions here
+docker run -i -t -d --name dmaap-buscontroller -p 8080:8080 -p 8443:8443 -v $TMP_CFG:/opt/app/config/conf $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION
+
+DBCL_FQDN=dbc.api.simpledemo.onap.org
+DRPS_FQDN=drprov.simpledemo.onap.org
+MR_FQDN=mr.api.simpledemo.onap.org
+# INITIALIZE: dmaap object
+JSON=/tmp/$$.dmaap
+cat << EOF > $JSON
+{
+"version": "1",
+"topicNsRoot": "org.onap.dmaap",
+"drProvUrl": "http://${DRPS_FQDN}:8080",
+"dmaapName": "onapStable",
+"bridgeAdminTopic": "MM_AGENT_PROV"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/dmaap 
+
+
+
+# INITIALIZE: dcaeLocation object
+JSON=/tmp/$$.loc
+cat << EOF > $JSON
+{
+"dcaeLocationName": "csit-sanfrancisco",
+"dcaeLayer": "central-cloud",
+"clli": "STABLE2345",
+"zone": "zoneA"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/dcaeLocations 
+
+
+# INITIALIZE: MR object in 1 site
+# Note: the values in the hosts[] are fictitious, and anticipate a 
+# future MR cluster deployment.
+JSON=/tmp/$$.mrc
+cat << EOF > $JSON
+{
+"dcaeLocationName": "stable-sanfrancisco",
+"fqdn": "${MR_FQDN}",
+"hosts" : [ 
+       "mrhost1.simpledemo.onap.org", 
+       "mrhost2.simpledemo.onap.org", 
+       "mrhost3.simpledemo.onap.org" 
+       ],
+"protocol" : "https",
+"port": "3094"
+
+}
+EOF
+
+curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/mr_clusters

diff --git a/boot/mr_install.sh b/boot/mr_install.sh
index e216838..9bd5656 100644 (file)
--- a/boot/mr_install.sh
+++ b/boot/mr_install.sh
@@ -54,6 +54,7 @@ apt-get update
 apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate
 
 # Download scripts from Nexus
+# a) scripts for message router (mr)
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_serv.sh -o /opt/mr_serv.sh
 chmod +x /opt/mr_vm_init.sh
@@ -61,6 +62,14 @@ chmod +x /opt/mr_serv.sh
 mv /opt/mr_serv.sh /etc/init.d
 update-rc.d mr_serv.sh defaults
 
+# b) scripts for bus controller (dbcl)
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dbcl_vm_init.sh -o /opt/dbcl_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dbcl_serv.sh -o /opt/dbcl_serv.sh
+chmod +x /opt/dbcl_vm_init.sh
+chmod +x /opt/dbcl_serv.sh
+mv /opt/dbcl_serv.sh /etc/init.d
+update-rc.d dbcl_serv.sh defaults
+
 # Download and install docker-engine and docker-compose
 echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
 apt-get update
@@ -94,4 +103,4 @@ resolvconf -u
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO dcae-startup-vm-message-router
-./mr_vm_init.sh
\ No newline at end of file
+./mr_vm_init.sh

diff --git a/boot/mr_vm_init.sh b/boot/mr_vm_init.sh
index af17781..bfc44c7 100644 (file)
--- a/boot/mr_vm_init.sh
+++ b/boot/mr_vm_init.sh
@@ -4,4 +4,6 @@ export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort
 
 cd /opt/dcae-startup-vm-message-router
 sed -i 's|wget .*|wget -q \"http://archive.apache.org/dist/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz\" \\|g' deploy.sh
-bash deploy.sh
\ No newline at end of file
+bash deploy.sh &
+
+bash dbcl_vm_init.sh &

diff --git a/boot/music_install.sh b/boot/music_install.sh
index 6965b95..759a938 100644 (file)
--- a/boot/music_install.sh
+++ b/boot/music_install.sh
@@ -5,7 +5,9 @@ NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
 ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
 DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
+GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
 MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
+CODE_REPO=$(cat /opt/config/remote_repo.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV != "rackspace" ]]
@@ -91,4 +93,5 @@ resolvconf -u
 
 # Clone Gerrit repository and run docker containers
 cd /opt
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
 ./music_vm_init.sh
\ No newline at end of file

diff --git a/boot/music_vm_init.sh b/boot/music_vm_init.sh
index b18aa99..372cd33 100644 (file)
--- a/boot/music_vm_init.sh
+++ b/boot/music_vm_init.sh
@@ -9,5 +9,9 @@ docker pull library/zookeeper:3.4
 docker pull library/tomcat:8.5
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/music/Cassandra:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/music/music:$DOCKER_IMAGE_VERSION
\ No newline at end of file
+docker pull $NEXUS_DOCKER_REPO/onap/music/cassandra_music:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/music/music:$DOCKER_IMAGE_VERSION
+
+cd /opt/music/distribution/dockermusic
+git pull
+./music.sh start
\ No newline at end of file

diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh
index f8776bd..b035092 100755 (executable)
--- a/boot/mvim_vm_init.sh
+++ b/boot/mvim_vm_init.sh
@@ -21,6 +21,6 @@ docker rm -f multicloud-ocata
 docker rm -f multicloud-windriver
 
 docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
-docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
+docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -e MR_ADDR=$MR_IP -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
 docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9006:9006 --name multicloud-ocata $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_VERSION
 docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9005:9005 --name multicloud-windriver $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_VERSION
\ No newline at end of file

diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index f193b20..47821e8 100755 (executable)
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -13,7 +13,7 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MVIMPROXY_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
@@ -24,7 +24,6 @@ docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$ZTEVMANAGERDRIVER_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
 docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
@@ -43,7 +42,6 @@ docker rm -f vfc_vnflcm
 docker rm -f vfc_vnfmgr
 docker rm -f vfc_vnfres
 docker rm -f vfc_ztesdncdriver
-docker rm -f vfc_ztevmanagerdriver
 docker rm -f vfc_ztevnfmdriver
 docker rm -f vfc_svnfm_nokia
 docker rm -f vfc_svnfm_nokiav2
@@ -64,6 +62,7 @@ docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEX
 docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
+docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
 
 CBAM_IP=$(cat /opt/config/cbam_ip.txt)
 VNFM_ID=vnfmUuid

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index a79a188..d252044 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -132,6 +132,7 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
@@ -173,7 +174,6 @@ parameters:
   vfc_wfengine_mgrservice_docker: latest
   vfc_wfengine_activiti_docker: latest
   vfc_multivimproxy_docker: 1.0.0-STAGING-latest
-  vfc_ztevmanagerdriver_docker: 1.0.3-STAGING-latest
 
   ############################################
   #                                          #
@@ -202,3 +202,4 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
+  music_repo: http://gerrit.onap.org/r/music.git
\ No newline at end of file

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 98d850b..b29218d 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -294,6 +294,8 @@ parameters:
     type: string
   vnfsdk_repo:
     type: string
+  music_repo:
+    type: string
 
   ################################
   #                              #
@@ -378,8 +380,6 @@ parameters:
     type: string
   vfc_wfengine_activiti_docker:
     type: string
-  vfc_ztevmanagerdriver_docker:
-    type: string
   vfc_multivimproxy_docker:
     type: string
 
@@ -414,6 +414,8 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
+  music_branch:
+    type: string
 
 
 #############
@@ -1587,6 +1589,7 @@ resources:
             __cbam_username__: { get_param: cbam_username }
             __cbam_password__: { get_param: cbam_password }
             __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+            __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
             __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
             __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
             __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1626,6 +1629,7 @@ resources:
 
             echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
             echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
@@ -1877,6 +1881,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: music_docker }
+            __music_repo__: { get_param: music_repo }
+            __gerrit_branch__: { get_param: music_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -1891,6 +1897,8 @@ resources:
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__music_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
 

diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 0eb5e3e..b530cfa 100644 (file)
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -290,6 +290,8 @@ parameters:
     type: string
   vnfsdk_repo:
     type: string
+  music_repo:
+    type: string
 
   ################################
   #                              #
@@ -406,6 +408,8 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
+  music_branch:
+    type: string
 
 
 #############
@@ -1576,6 +1580,7 @@ resources:
             __cbam_username__: { get_param: cbam_username }
             __cbam_password__: { get_param: cbam_password }
             __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+            __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
             __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
             __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
             __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1615,6 +1620,7 @@ resources:
 
             echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
             echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
@@ -1863,6 +1869,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: music_docker }
+            __music_repo__: { get_param: music_repo }
+            __gerrit_branch__: { get_param: music_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -1877,6 +1885,8 @@ resources:
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__music_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
 

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 1eb2ff4..5bbd9ab 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -132,6 +132,7 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -173,7 +174,6 @@ parameters:
   vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER}
   vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
   vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
-  vfc_ztevmanagerdriver_docker: ${ZTEVMANAGERDRIVER_DOCKER}
 
   ############################################
   #                                          #
@@ -202,3 +202,4 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
+  music_repo: http://gerrit.onap.org/r/music.git

diff --git a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
index 693b745..8fff6bc 100644 (file)
--- a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
+++ b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <parent>
+  <!--parent>
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.17.07</version>
+  </parent-->
+
+  <parent>
+    <artifactId>demo-aggregator</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <groupId>org.onap.demo.vnf</groupId>
+    <relativePath>../../../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -83,7 +90,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
+      <!--plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
         <version>1.6.7</version>
@@ -93,11 +100,11 @@
           <stagingProfileId>176c31dfe190a</stagingProfileId>
           <serverId>ecomp-staging</serverId>
         </configuration>
-      </plugin>
+      </plugin-->
     </plugins>
   </build>
 
-  <distributionManagement>
+  <!--distributionManagement>
     <repository>
       <id>ecomp-releases</id>
       <name>Demo Release Repository</name>
@@ -108,7 +115,7 @@
       <name>Demo Snapshot Repository</name>
       <url>https://nexus.onap.org/content/repositories/snapshots/</url>
     </snapshotRepository>
-  </distributionManagement>
+  </distributionManagement-->
 
   <dependencies>
     <!-- Dependency on sample plugin -->