diff options
| -rw-r--r-- | boot/appc_vm_init.sh | 4 | ||||
| -rw-r--r-- | boot/policy_vm_init.sh | 16 | ||||
| -rwxr-xr-x | boot/vfc_vm_init.sh | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 |
5 files changed, 20 insertions, 10 deletions
diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh index dce1932e..8534a347 100644 --- a/boot/appc_vm_init.sh +++ b/boot/appc_vm_init.sh @@ -16,8 +16,8 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.ym docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION openecomp/appc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION openecomp/appc-image:latest docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh index b2a7c471..80e1b644 100644 --- a/boot/policy_vm_init.sh +++ b/boot/policy_vm_init.sh @@ -51,16 +51,16 @@ echo $IP_ADDRESS > config/pe/ip_addr.txt docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-db:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db:latest +#docker pull $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION +#docker tag $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db:latest -docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-pe:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-pe:$DOCKER_IMAGE_VERSION onap/policy/policy-pe:latest +docker pull $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy/policy-pe:latest -docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-drools:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-drools:$DOCKER_IMAGE_VERSION onap/policy/policy-drools:latest +docker pull $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION onap/policy/policy-drools:latest -docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-nexus:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy/policy-nexus:latest +docker pull $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy/policy-nexus:latest /opt/docker/docker-compose up -d diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index f7387b73..f193b20d 100755 --- a/boot/vfc_vm_init.sh +++ b/boot/vfc_vm_init.sh @@ -13,6 +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/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 @@ -23,6 +24,7 @@ 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 @@ -31,6 +33,7 @@ docker rm -f vfc_wfengine_mgrservice docker rm -f vfc_wfengine_activiti docker rm -f vfc_catalog docker rm -f vfc_emsdriver +docker rm -f vfc_multivimproxy docker rm -f vfc_gvnfmdriver docker rm -f vfc_jujudriver docker rm -f vfc_svnfm_huawei @@ -40,6 +43,7 @@ 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 diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 675fb55b..93f8e4ae 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -158,6 +158,7 @@ parameters: vfc_nokia_docker: v1.0.2 vfc_nokiav2_docker: 1.1.0-STAGING-latest vfc_ztevnfmdriver_docker: v1.0.2 + vfc_ztevmanagerdriver_docker: v1.0.0 vfc_ztesdncdriver_docker: v1.0.0 vfc_vnfres_docker: v1.0.1 vfc_vnfmgr_docker: v1.0.1 @@ -171,6 +172,7 @@ parameters: vfc_catalog_docker: v1.0.2 vfc_wfengine_mgrservice_docker: v1.0.0 vfc_wfengine_activiti_docker: v1.0.0 + vfc_multivimproxy_docker: v1.0.0 ############################################ # # diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 0566e972..82ca78b0 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -374,6 +374,10 @@ parameters: type: string vfc_wfengine_activiti_docker: type: string + vfc_ztevmanagerdriver_docker: + type: string + vfc_multivimproxy_docker: + type: string cbam_username: type: string |