Use release version of demo in env template

[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 721fd9d..60a0abb 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.0-SNAPSHOT
+  artifacts_version: 1.2.0
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -92,6 +92,7 @@ parameters:
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
+  sms_ip_addr: 10.0.13.2
   nbi_ip_addr: 10.0.17.1
 
   ###########################
@@ -135,6 +136,7 @@ parameters:
   music_branch: master
   nbi_branch: master
   aaf_branch: master
+  sms_branch: master
   oof_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
@@ -150,16 +152,18 @@ parameters:
   clamp_docker: ${CLAMP_DOCKER}
   msb_docker: ${MSB_APIGATEWAY_DOCKER}
   mvim_docker: ${FRAMEWORK_DOCKER}
+  mvim_openstack_docker: ${OPENSTACK_OCATA_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}
+  oof_docker: ${OPTF_OSDF_DOCKER}
+  aaf_docker: ${AAF_SERVICE_DOCKER}
+  sms_docker: ${SMS_DOCKER}
   nbi_docker: ${NBI_DOCKER}
-  dbcl_docker: ${DBCL_DOCKER}
+  dbcl_docker: ${BUSCONTROLLER_DOCKER}
 
   dcae_docker:  ${BOOTSTRAP_DOCKER}
   dcae_snmptrap_docker:  ${SNMPTRAP_DOCKER}
@@ -198,16 +202,6 @@ parameters:
   vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
   vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
 
-  ############################################
-  #                                          #
-  # Parameters used by Nokia v2 SVNFM driver #
-  #                                          #
-  ############################################
-
-  cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
-
   #####################
   #                   #
   # ONAP repositories #
@@ -215,7 +209,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
@@ -228,4 +222,5 @@ 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
+  sms_repo: http://gerrit.onap.org/r/aaf/sms.git
+  oof_repo: http://gerrit.onap.org/r/optf/has.git