Set portal_docker version to 1.3-STAGING-latest

[demo.git] / heat / ONAP / onap_openstack.env

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index b94bcca..7c42979 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -20,6 +20,8 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
+  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
+
   vm_base_name: vm1
 
   key_name: onap_key
@@ -38,10 +40,6 @@ parameters:
 
   artifacts_version: 1.1.0-SNAPSHOT
 
-  docker_version: 1.1-STAGING-latest
-
-  gerrit_branch: master
-
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
   openstack_username: PUT YOUR OPENSTACK USERNAME HERE
@@ -67,10 +65,10 @@ parameters:
 
   dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
   external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
+  oam_network_cidr: 10.0.0.0/16
 
   ### Private IP addresses ###
 
-  oam_network_cidr: 10.0.0.0/16
   aai1_ip_addr: 10.0.1.1
   aai2_ip_addr: 10.0.1.2
   appc_ip_addr: 10.0.2.1
@@ -81,7 +79,7 @@ parameters:
   dcae_hdp2_ip_addr: 10.0.4.104
   dcae_hdp3_ip_addr: 10.0.4.105
   dns_ip_addr: 10.0.100.1
-  mso_ip_addr: 10.0.5.1
+  so_ip_addr: 10.0.5.1
   mr_ip_addr: 10.0.11.1
   policy_ip_addr: 10.0.6.1
   portal_ip_addr: 10.0.9.1
@@ -89,6 +87,8 @@ parameters:
   sdc_ip_addr: 10.0.3.1
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
+  clamp_ip_addr: 10.0.12.1
+  openo_ip_addr: 10.0.14.1
 
   dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
   dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
@@ -114,4 +114,62 @@ parameters:
 
   gitlab_branch: master
 
-  dcae_code_version: 1.1.0
\ No newline at end of file
+  dcae_code_version: 1.1.0
+
+
+  ################################
+  #                              #
+  # Docker versions and branches #
+  #                              #
+  ################################
+
+  aai_branch: master
+  appc_branch: master
+  so_branch: master
+  mr_branch: master
+  dcae_branch: master
+  policy_branch: master
+  portal_branch: master
+  robot_branch: master
+  sdc_branch: master
+  sdnc_branch: master
+  vid_branch: master
+  clamp_branch: master
+  vnfsdk_branch: master
+
+  aai_docker: 1.1-STAGING-latest
+  appc_docker: 1.1-STAGING-latest
+  so_docker: 1.1-STAGING-latest
+  mr_docker: 1.1-STAGING-latest
+  dcae_docker: 1.1-STAGING-latest
+  policy_docker: 1.1-STAGING-latest
+  portal_docker: 1.3-STAGING-latest
+  robot_docker: 1.1-STAGING-latest
+  sdc_docker: 1.1-STAGING-latest
+  sdnc_docker: 1.2-STAGING-latest
+  vid_docker: 1.1-STAGING-latest
+  clamp_docker: 1.1-STAGING-latest
+  msb_docker: latest
+  mvim_docker: latest
+  vfc_docker: latest
+  uui_docker: latest
+  dgbuilder_docker: 0.1-STAGING-latest
+
+  #####################
+  #                   #
+  # ONAP repositories #
+  #                   #
+  #####################
+  aai_repo: http://gerrit.onap.org/r/aai/test-config
+  appc_repo: http://gerrit.onap.org/r/appc/deployment.git
+  dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
+  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
+  so_repo: http://gerrit.onap.org/r/so/docker-config.git
+  policy_repo: http://gerrit.onap.org/r/policy/docker.git
+  portal_repo: http://gerrit.onap.org/r/portal.git
+  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
+  sdc_repo: http://gerrit.onap.org/r/sdc.git
+  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
+  vid_repo: http://gerrit.onap.org/r/vid.git
+  clamp_repo: http://gerrit.onap.org/r/clamp.git
+  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git