diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-06 14:02:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-06 14:02:10 +0000 |
| commit | 1ddd3c58a74617ed1937611296fc58a37a7a93e9 (patch) | |
| tree | 6f3da536e114a327b20d7ccea18899ba80856520 | |
| parent | dcd8549cddda82a25a55844d1f21693a25394ef7 (diff) | |
| parent | 00d7ad6122d396b74da01f53bfd5f6aab485de17 (diff) | |
Merge "Change release version"
| -rwxr-xr-x | boot/mvim_vm_init.sh | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh index 0408d1b9..5d7086a1 100755 --- a/boot/mvim_vm_init.sh +++ b/boot/mvim_vm_init.sh @@ -13,7 +13,7 @@ source /opt/config/onap_ips.txt 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/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION docker rm -f multicloud-broker @@ -23,5 +23,5 @@ 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 -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_OPENSTACK_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/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_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_OPENSTACK_VERSION diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 4a72927a..5243429f 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -134,8 +134,8 @@ parameters: vid_docker: 2.0.0 clamp_docker: 2.0.2 msb_docker: 1.1.0 - mvim_docker: 1.1.2-STAGING - mvim_openstack_docker: 1.1.2-SNAPSHOT + mvim_docker: 1.1.2 + mvim_openstack_docker: 1.1.2 uui_docker: latest esr_docker: 1.1.0 sdc_wfd_docker: 1.1.0 |