Merge "Add pike plugin for demo"

diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh
index 395f819..c625c1a 100644 (file)
--- a/boot/msb_vm_init.sh
+++ b/boot/msb_vm_init.sh
@@ -150,6 +150,8 @@ curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v1", "url": "/api/multicloud-ocata/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-pike", "version": "v0", "url": "/api/multicloud-pike/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9007"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v0", "url": "/api/multicloud-titaniumcloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v1", "url": "/api/multicloud-titaniumcloud/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 

diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh
index 79ae0ad..2295f07 100755 (executable)
--- a/boot/mvim_vm_init.sh
+++ b/boot/mvim_vm_init.sh
@@ -14,14 +14,17 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-pike:$DOCKER_IMAGE_OPENSTACK_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION
 
 docker rm -f multicloud-broker
 docker rm -f multicloud-vio
 docker rm -f multicloud-ocata
+docker rm -f multicloud-pike
 docker rm -f multicloud-windriver
 
 docker run -d -t -e MSB_ADDR=$MULTISERV_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=$MULTISERV_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=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9006:9006 --name multicloud-ocata $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
+docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9007:9007 --name multicloud-pike $NEXUS_DOCKER_REPO/onap/multicloud/openstack-pike:$DOCKER_IMAGE_OPENSTACK_VERSION
 docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9005:9005 --name multicloud-windriver $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION