Merge "Add vfc-db docker to vfc_vm_init.sh"

4 files changed, 15 insertions, 5 deletions

diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index 6252489b..3f209d46 100755
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -10,6 +10,7 @@ source /opt/config/vfc_docker.txt
 
 # Refresh images
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/db:$DB_DOCKER_VER
 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
@@ -28,6 +29,7 @@ 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
 
+docker rm -f vfc_db
 docker rm -f vfc_wfengine_mgrservice
 docker rm -f vfc_wfengine_activiti
 docker rm -f vfc_catalog
@@ -47,18 +49,20 @@ docker rm -f vfc_svnfm_nokia
 docker rm -f vfc_svnfm_nokiav2
 
 # Insert docker run instructions here
+docker run -i -t -d --name vfc_db -p 3306:3306 -p 6379:6379 $NEXUS_DOCKER_REPO/onap/vfc/db:$DB_DOCKER_VER
+VFC_DB_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vfc_db`
 docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
 docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
-docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
+docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
 docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
-docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
+docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
 docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
-docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
-docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
-docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
+docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
+docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
+docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
 docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
 docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 427a9ad8..2cef506d 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -170,6 +170,7 @@ parameters:
   holmes_rm_docker: 1.1.0
   holmes_em_docker: 1.1.0
 
+  vfc_db_docker: 1.1.0
   vfc_nokia_docker: 1.1.0
   vfc_nokiav2_docker: 1.1.0
   vfc_ztevnfmdriver_docker: 1.1.0
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e9866536..eaec4f42 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -459,6 +459,8 @@ parameters:
   dbcl_docker:
     type: string
 
+  vfc_db_docker:
+    type: string
   vfc_nokia_docker:
     type: string
   vfc_nokiav2_docker:
@@ -1951,6 +1953,7 @@ resources:
               __uui_docker__: { get_param: uui_docker }
               __esr_docker__: { get_param: esr_docker }
               __vnfsdk_repo__: { get_param: vnfsdk_repo }
+              __vfc_db_docker__: { get_param: vfc_db_docker }
               __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
               __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
               __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
@@ -1981,6 +1984,7 @@ resources:
               echo "__esr_docker__" > /opt/config/esr_docker.txt
               echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
+              echo "export DB_DOCKER_VER=__vfc_db_docker__" >> /opt/config/vfc_docker.txt
               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
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index e9c1cc19..0a60ce13 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -170,6 +170,7 @@ parameters:
   holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
   holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}
 
+  vfc_db_docker: ${DB_DOCKER}
   vfc_nokia_docker: ${NOKIA_DOCKER}
   vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
   vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER}