Fix policy docker tagging

The OOM requested removal of policy from the path for
Beijing release. And updated to latest SNAPSHOT docker
image.

Issue-ID: INT-444
Change-Id: Id26988aef817c223a95eee5ad1605bc6641388a5
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh
index 80e1b64..a772a50 100644 (file)
--- a/boot/policy_vm_init.sh
+++ b/boot/policy_vm_init.sh
@@ -55,12 +55,12 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 #docker tag $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db: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 tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy-pe: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 tag $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION onap/policy-drools: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
+docker tag $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy-nexus:latest
 
 /opt/docker/docker-compose up -d

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index d802942..a79a188 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -138,7 +138,7 @@ parameters:
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
   dcae_docker: v1.1.1
-  policy_docker: v1.1.1
+  policy_docker: 1.2-SNAPSHOT-latest
   portal_docker: 2.1-STAGING-latest
   robot_docker: 1.2-STAGING-latest
   sdc_docker: 1.2-STAGING-latest