X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=3ad17cfaa5e1479dc94954a1681f568307ba1931;hb=3f65668acbd8b6962d29ac95a9d50ba856b89453;hp=36f787dc0ba0c785a9fce4d204dfc4c903db748b;hpb=c20294d9fda0fbe11cce7119f56c4e5d4bd49318;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 36f787dc..3ad17cfa 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.1.0-SNAPSHOT
+  artifacts_version: 1.1.1
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -111,56 +111,57 @@ parameters:
   ################################
   #                              #
   # Docker versions and branches #
+  # Generated using onap_openstack_template.env and manifest-to-env.sh
   #                              #
   ################################
 
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
+  aai_branch: amsterdam
+  appc_branch: amsterdam
+  so_branch: amsterdam
   mr_branch: master
-  policy_branch: master
-  portal_branch: release-1.3.0
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
+  policy_branch: amsterdam
+  portal_branch: amsterdam
+  robot_branch: amsterdam
+  sdc_branch: release-1.1.0
+  sdnc_branch: amsterdam
+  vid_branch: amsterdam
+  clamp_branch: amsterdam
+  vnfsdk_branch: amsterdam
 
   aai_docker: v1.1.0
-  aai_sparky_docker: v1.0.0
-  appc_docker: 1.2.0
-  so_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
+  policy_docker: v1.1.2
   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: 1.0.0-STAGING-latest
-  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: 1.0.2-STAGING-latest
-  vfc_ztevmanagerdriver_docker: 1.0.2-STAGING-latest
-  vfc_ztesdncdriver_docker: 1.0.0-STAGING-latest
-  vfc_vnfres_docker: 1.0.1-STAGING-latest
-  vfc_vnfmgr_docker: 1.0.1-STAGING-latest
-  vfc_vnflcm_docker: 1.0.1-STAGING-latest
-  vfc_resmanagement_docker: 1.0.0-STAGING-latest
-  vfc_nslcm_docker: 1.0.2-STAGING-latest
-  vfc_huawei_docker: v1.0.0
-  vfc_jujudriver_docker: 1.0.0-STAGING-latest
-  vfc_gvnfmdriver_docker: 1.0.1-STAGING-latest
-  vfc_emsdriver_docker: 1.0.1-STAGING-latest
-  vfc_catalog_docker: 1.0.2-STAGING-latest
-  vfc_wfengine_mgrservice_docker: 1.0.0-STAGING-latest
-  vfc_wfengine_activiti_docker: 1.0.0-STAGING-latest
+  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.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.2
+  vfc_wfengine_mgrservice_docker: v1.0.0
+  vfc_wfengine_activiti_docker: v1.0.0
 
   #####################
   #                   #