diff options
| -rwxr-xr-x | boot/vfc_vm_init.sh | 5 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index f193b20d..47821e8a 100755 --- 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 a79a188d..1db5408d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -173,7 +173,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 ############################################ # # diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 98d850bb..503d241d 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1587,6 +1587,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 +1627,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 diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 0eb5e3e8..8e2b2f76 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -1576,6 +1576,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 +1616,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 |