X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=a563fc3443fa5766f943914d7fc8ee70aa8a0522;hb=e7158f992680089b24ff077253c98b79d1afc40c;hp=b9f0856cfb14966852f1f80528e6778c397729e2;hpb=af6264f6c850828ec4e54285b6f812c477741801;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index b9f0856c..a563fc34 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -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: 1.2-STAGING-latest
@@ -142,22 +144,24 @@ parameters:
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
   policy_docker: 1.2.0
-  portal_docker: 2.1-STAGING-latest
+  portal_docker: v2.2.0
   robot_docker: 1.2-STAGING-latest
   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
   sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
-  dgbuilder_docker: 0.2.1-SNAPSHOT
-  cli_docker: 2.0-STAGING-latest
+  dgbuilder_docker: 0.2-STAGING-latest
+  cli_docker: 2.0.2
   music_docker: latest
   oof_docker: latest
   aaf_docker: 2.1.0-SNAPSHOT
+  sms_docker: latest
   nbi_docker: latest
   dbcl_docker: latest
 
@@ -177,8 +181,8 @@ parameters:
   dcae_sch_docker: latest
   dcae_heartbeat_docker: latest
   dcae_prh_docker: latest
-  holmes_rm_docker: v1.0.0
-  holmes_em_docker: v1.0.0
+  holmes_rm_docker: latest
+  holmes_em_docker: latest
 
   vfc_nokia_docker: 1.1.0-STAGING-latest
   vfc_nokiav2_docker: 1.1.0-STAGING-latest
@@ -198,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 #
@@ -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/dmaap/messagerouter/messageservice.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
+  sms_repo: http://gerrit.onap.org/r/aaf/sms.git
   oof_repo: http://gerrit.onap.org/r/optf/has.git