X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=0d42937fc5b976e5195b19e1aa9728d522b19b0d;hb=a4ec3a7b9cc120e4ccafda62c7749e71058ffedb;hp=d252044d55dddb75352dec7709d37b23324bd503;hpb=060092fe3d74293c2b32e333d3cd8ea7afc32add;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index d252044d..0d42937f 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.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
 
   ###########################
@@ -100,7 +101,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 +134,55 @@ parameters:
   clamp_branch: master
   vnfsdk_branch: master
   music_branch: master
+  nbi_branch: master
+  aaf_branch: master
+  sms_branch: master
+  oof_branch: master
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
-  dcae_docker: v1.1.1
-  policy_docker: 1.2-SNAPSHOT-latest
-  portal_docker: 2.1-STAGING-latest
-  robot_docker: 1.2-STAGING-latest
+  policy_docker: 1.2.0
+  portal_docker: v2.2.0
+  robot_docker: 1.2.0
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
   vid_docker: 1.2.1
   clamp_docker: 2.0-STAGING-latest
   msb_docker: 1.1.0-STAGING-latest
-  mvim_docker: v1.0.0
-  uui_docker: 1.1.0-SNAPSHOT-STAGING-latest
+  mvim_docker: 1.1.2-STAGING
+  mvim_openstack_docker: 1.1.2-SNAPSHOT
+  uui_docker: latest
   esr_docker: 1.1.0-SNAPSHOT
-  dgbuilder_docker: 0.2.1-SNAPSHOT
-  cli_docker: v1.1.0
+  sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
+  dgbuilder_docker: 0.2-STAGING-latest
+  cli_docker: 2.0-STAGING-latest
   music_docker: latest
   oof_docker: latest
-  aaf_docker: latest
+  aaf_docker: 2.1.0-SNAPSHOT
+  sms_docker: latest
   nbi_docker: latest
+  dbcl_docker: latest
+
+  dcae_docker:  1.1.2
+  dcae_snmptrap_docker:  latest
+  dcae_ves_docker:  latest
+  dcae_bootstrap_docker: 1.1.2
+  dcae_cm_docker: latest
+  dcae_k8sbootstrap_docker: latest
+  dcae_redisc_docker: latest
+  dcae_tca_docker: latest
+  dcae_cb_docker: v4.0.0
+  dcae_cbs_docker: latest
+  dcae_dh_docker: latest
+  dcae_inv_docker: latest
+  dcae_ph_docker: latest
+  dcae_sch_docker: latest
+  dcae_heartbeat_docker: latest
+  dcae_prh_docker: latest
+  holmes_rm_docker: latest
+  holmes_em_docker: latest
 
   vfc_nokia_docker: 1.1.0-STAGING-latest
   vfc_nokiav2_docker: 1.1.0-STAGING-latest
@@ -175,16 +202,6 @@ parameters:
   vfc_wfengine_activiti_docker: latest
   vfc_multivimproxy_docker: 1.0.0-STAGING-latest
 
-  ############################################
-  #                                          #
-  # 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 #
@@ -192,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
@@ -202,4 +219,8 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   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
\ No newline at end of file
+  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
+  sms_repo: http://gerrit.onap.org/r/aaf/sms.git
+  oof_repo: http://gerrit.onap.org/r/optf/has.git