Merge "INT-444 adding the osdf vm init script"

diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh
index 3803a83..099ef8f 100644 (file)
--- a/boot/policy_vm_init.sh
+++ b/boot/policy_vm_init.sh
@@ -71,7 +71,7 @@ docker tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy-p
 docker pull $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION
 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-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-nexus:latest
 
 /opt/docker/docker-compose up -d

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 05a9d78..0d77054 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -141,7 +141,7 @@ parameters:
   aai_sparky_docker: 1.2-STAGING-latest
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
-  policy_docker: 1.2-STAGING-latest
+  policy_docker: v1.2.0
   portal_docker: 2.1-STAGING-latest
   robot_docker: 1.2-STAGING-latest
   sdc_docker: 1.2-STAGING-latest
@@ -227,4 +227,4 @@ parameters:
   music_repo: http://gerrit.onap.org/r/music.git
   nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
   aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
-  oof_repo: http://gerrit.onap.org/r/optf/has.git
\ No newline at end of file
+  oof_repo: http://gerrit.onap.org/r/optf/has.git