Maintain independent image version for M.C. plugin

[demo.git] / heat / ONAP / onap_openstack_template.env

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index f3254c2..b81cc67 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -100,7 +100,7 @@ parameters:
   #                         #
   ###########################
 
-  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1 or R2MVP)
+  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS)
   dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
   dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
   dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
@@ -133,29 +133,34 @@ parameters:
   clamp_branch: master
   vnfsdk_branch: master
   music_branch: master
+  nbi_branch: master
+  aaf_branch: master
+  oof_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
   appc_docker: ${APPC_IMAGE_DOCKER}
   so_docker: ${MSO_DOCKER}
-  policy_docker: ${POLICY_DB_DOCKER}
+  policy_docker: ${POLICY_PE_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: ${TESTSUITE_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
-  sdc_wfd_docker: ${SDC_WFD_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
   vid_docker: ${VID_DOCKER}
   clamp_docker: ${CLAMP_DOCKER}
   msb_docker: ${MSB_APIGATEWAY_DOCKER}
   mvim_docker: ${FRAMEWORK_DOCKER}
+  mvim_openstack_docker: ${MC_OPENSTACK_DOCKER}
   uui_docker: ${USECASE_UI_SERVER_DOCKER}
   esr_docker: ${ESR_SERVER_DOCKER}
+  sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER}
   dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
   cli_docker: ${CLI_DOCKER}
   music_docker: ${MUSIC_DOCKER}
   oof_docker: ${OOF_DOCKER}
   aaf_docker: ${AAF_DOCKER}
   nbi_docker: ${NBI_DOCKER}
+  dbcl_docker: ${DBCL_DOCKER}
 
   dcae_docker:  ${BOOTSTRAP_DOCKER}
   dcae_snmptrap_docker:  ${SNMPTRAP_DOCKER}
@@ -211,7 +216,7 @@ parameters:
   #####################
   aai_repo: http://gerrit.onap.org/r/aai/test-config
   appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
+  mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git 
   so_repo: http://gerrit.onap.org/r/so/docker-config.git
   policy_repo: http://gerrit.onap.org/r/policy/docker.git
   portal_repo: http://gerrit.onap.org/r/portal.git
@@ -222,3 +227,6 @@ parameters:
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
   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