Sync up env template with env file changes

Change-Id: Ie53c0a5bd061da91f63092bfcef6334989f61fc0
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index c8f76f2..1b3cd2e 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,6 +133,7 @@ parameters:
   clamp_branch: master
   vnfsdk_branch: master
   music_branch: master
+  nbi_branch: master
   aaf_branch: master
   oof_branch: master
 
@@ -140,11 +141,10 @@ parameters:
   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}
@@ -152,6 +152,7 @@ parameters:
   mvim_docker: ${FRAMEWORK_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}
@@ -224,5 +225,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
\ No newline at end of file