X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=95abf979508d1c72ce3fd0d2ecf5272bb5f99fbc;hb=c9e00752d8850e0e61e83e01aa011ae39b889450;hp=03e95e230380791bec15b1dc54a496941c044f61;hpb=50dfba7b18bf012d71ba460f415624d1996f2ff7;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 03e95e23..95abf979 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
 
@@ -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,54 +111,55 @@ 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: release-1.1.0
-  sdnc_branch: release-1.1.0
-  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: v1.1.0
-  policy_docker: v1.1.1
+  policy_branch: amsterdam
+  portal_branch: amsterdam
+  robot_branch: amsterdam
+  sdc_branch: amsterdam
+  sdnc_branch: amsterdam
+  vid_branch: amsterdam
+  clamp_branch: amsterdam
+  vnfsdk_branch: amsterdam
+
+  aai_docker: v1.1.1
+  aai_sparky_docker: v1.1.1
+  appc_docker: v1.2.0
+  so_docker: v1.1.2
+  dcae_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.2
+  vid_docker: v1.1.1
   clamp_docker: v1.1.0
   msb_docker: 1.0.0
-  mvim_docker: latest
-  uui_docker: latest
+  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.1
   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