From 2b048ca69a0fb3b8a76746a1d6cb8cf5075a73c5 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Thu, 21 Sep 2017 18:00:24 -0400 Subject: Add OPEN-O VM to Heat template - Add OPEN-O VM with MSB, Multi-VIM, VNFSDK, VFC, UUI - Add branch name per component - Add docker version number per component - Add xxlarge flavor to Heat for OPEN-O VM - Add MSB, Multi-VIM, VNFSDK, VFC, UUI to DNS config - Rename MSO to SO (wherever possible) Change-Id: Ie64563486212b4589b190e5c52d6524f9ca22850 Issue-ID: INT-213 Signed-off-by: Marco Platania --- heat/ONAP/onap_rackspace.env | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'heat/ONAP/onap_rackspace.env') diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 5c82a47f..d92b3c71 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -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,30 @@ 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: master + 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: 1.1-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 + dgbuilder_docker: 0.1-STAGING-latest -- cgit 1.2.3-korg