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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 0aea45c5..a563fc34 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -144,7 +144,7 @@ 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
@@ -153,11 +153,11 @@ parameters:
   msb_docker: 1.1.0-STAGING-latest
   mvim_docker: 1.1.2-STAGING
   mvim_openstack_docker: 1.1.2-SNAPSHOT
-  uui_docker: 1.1.0-SNAPSHOT-STAGING-latest
+  uui_docker: latest
   esr_docker: 1.1.0-SNAPSHOT
   sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
   dgbuilder_docker: 0.2-STAGING-latest
-  cli_docker: 2.0-STAGING-latest
+  cli_docker: 2.0.2
   music_docker: latest
   oof_docker: latest
   aaf_docker: 2.1.0-SNAPSHOT
@@ -202,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 #