X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_rackspace.env;h=d08c24e84924726ee32db21cf24f69ddae4edd36;hb=c0e48e2923af5ea1e77d8741d695ce5553d22ab3;hp=5c82a47ffd00f8771cffe9fb2a8eb02d9a329d19;hpb=569b54f0659cc790c0c9c2eec3a72884b6162626;p=demo.git

diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env
index 5c82a47f..d08c24e8 100644
--- a/heat/ONAP/onap_rackspace.env
+++ b/heat/ONAP/onap_rackspace.env
@@ -4,10 +4,10 @@ parameters:
 
   public_net_id: 00000000-0000-0000-0000-000000000000
 
-  key_name: onap_key
-
   vm_base_name: vm1
 
+  key_name: onap_key
+
   pub_key: INSERT YOUR PUBLIC KEY HERE
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
@@ -32,10 +32,6 @@ parameters:
 
   artifacts_version: 1.1.0-SNAPSHOT
 
-  docker_version: 1.1-STAGING-latest
-
-  gerrit_branch: master
-
   cloud_env: rackspace
 
 
@@ -66,17 +62,13 @@ parameters:
   dcae_hdp2_ip_addr: 10.0.4.104
   dcae_hdp3_ip_addr: 10.0.4.105
 
+  # ONAP repositories, docker versions, and Gerrit branches
 
-  #####################
-  #                   #
-  # 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
-  mso_repo: http://gerrit.onap.org/r/so/docker-config.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
@@ -84,3 +76,31 @@ parameters:
   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
+
+  aai_branch: master
+  appc_branch: master
+  so_branch: master
+  mr_branch: master
+  dcae_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
+
+  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: v1.3.0
+  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
+  dgbuilder_docker: 0.1-STAGING-latest
+  cli_docker: v1.1.0