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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 0aea45c5..68be91e6 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -22,16 +22,12 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
-  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
   vm_base_name: onap
 
   key_name: onap_key
 
   pub_key: PUT YOUR PUBLIC KEY HERE
 
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
   nexus_docker_repo: nexus3.onap.org:10001
 
   nexus_username: docker
@@ -40,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.0-SNAPSHOT
+  artifacts_version: 1.2.1-SNAPSHOT
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -54,8 +50,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: PUT THE HORIZON URL HERE
-
   keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
 
   cloud_env: openstack
@@ -143,9 +137,9 @@ parameters:
   aai_sparky_docker: 1.2-STAGING-latest
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
-  policy_docker: 1.2.0
-  portal_docker: 2.1-STAGING-latest
-  robot_docker: 1.2-STAGING-latest
+  policy_docker: 1.2.2
+  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
@@ -153,8 +147,8 @@ 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
-  esr_docker: 1.1.0-SNAPSHOT
+  uui_docker: latest
+  esr_docker: latest
   sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
   dgbuilder_docker: 0.2-STAGING-latest
   cli_docker: 2.0-STAGING-latest
@@ -202,16 +196,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 #