X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=56a8e623be19c506b5d806907a0eb8d979b3ca8d;hb=12fd5fcf0e58f79cd4666592dd0fc34090b298e7;hp=a579bf0042d7a35fa77df578448ae758efd4ddac;hpb=d3fb233b20f07a68632ab6c14148bcbfbfe506bc;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index a579bf00..56a8e623 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -24,7 +24,7 @@ parameters:
 
   flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
 
-  vm_base_name: vm1
+  vm_base_name: onap
 
   key_name: onap_key
 
@@ -111,6 +111,7 @@ parameters:
   ################################
   #                              #
   # Docker versions and branches #
+  # Generated using onap_openstack_template.env and manifest-to-env.sh
   #                              #
   ################################
 
@@ -118,47 +119,47 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: master
+  policy_branch: amsterdam
   portal_branch: release-1.3.0
   robot_branch: master
-  sdc_branch: release-1.1.0
-  sdnc_branch: release-1.1.0
+  sdc_branch: master
+  sdnc_branch: master
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
 
   aai_docker: v1.1.0
-  aai_sparky_docker: v1.0.0
-  appc_docker: 1.1-STAGING-latest
-  so_docker: v1.1.0
-  dcae_docker: 1.1-latest
-  policy_docker: v1.1.0
+  aai_sparky_docker: v1.1.0
+  appc_docker: v1.2.0
+  so_docker: v1.1.1
+  dcae_docker: v1.1.0
+  policy_docker: v1.1.1
   portal_docker: v1.3.0
   robot_docker: 1.1-STAGING-latest
-  sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-STAGING-latest
-  vid_docker: v1.1.0
+  sdc_docker: v1.1.0
+  sdnc_docker: v1.2.1
+  vid_docker: v1.1.1
   clamp_docker: v1.1.0
-  msb_docker: v1.0.0
-  mvim_docker: latest
-  uui_docker: latest
+  msb_docker: 1.0.0
+  mvim_docker: v1.0.0
+  uui_docker: v1.0.1
   esr_docker: v1.0.0
-  dgbuilder_docker: 0.1-STAGING-latest
+  dgbuilder_docker: v0.1.0
   cli_docker: v1.1.0
 
-  vfc_nokia_docker: v1.0.0
-  vfc_ztevmanagerdriver_docker: v1.0.1
-  vfc_ztesdncdriver_docker: v1.0.1
+  vfc_nokia_docker: v1.0.2
+  vfc_ztevmanagerdriver_docker: v1.0.2
+  vfc_ztesdncdriver_docker: v1.0.0
   vfc_vnfres_docker: v1.0.1
   vfc_vnfmgr_docker: v1.0.1
   vfc_vnflcm_docker: v1.0.1
   vfc_resmanagement_docker: v1.0.0
-  vfc_nslcm_docker: v1.0.1
-  vfc_huawei_docker: v1.0.0
+  vfc_nslcm_docker: v1.0.2
+  vfc_huawei_docker: v1.0.2
   vfc_jujudriver_docker: v1.0.0
   vfc_gvnfmdriver_docker: v1.0.1
   vfc_emsdriver_docker: v1.0.1
-  vfc_catalog_docker: v1.0.1
+  vfc_catalog_docker: v1.0.2
   vfc_wfengine_mgrservice_docker: v1.0.0
   vfc_wfengine_activiti_docker: v1.0.0