diff options
author | 2017-09-21 18:00:24 -0400 | |
---|---|---|
committer | 2017-09-21 18:00:24 -0400 | |
commit | 2b048ca69a0fb3b8a76746a1d6cb8cf5075a73c5 (patch) | |
tree | 271aef35d15d5abad98571808258c329960893a4 /heat/ONAP/onap_openstack_float.env | |
parent | 55543b2563fc6e4ff2b42f881538388ade96c71f (diff) |
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 <platania@research.att.com>
Diffstat (limited to 'heat/ONAP/onap_openstack_float.env')
-rw-r--r-- | heat/ONAP/onap_openstack_float.env | 57 |
1 files changed, 48 insertions, 9 deletions
diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index bbc70199..4b7e9f4f 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -24,6 +24,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 @@ -42,10 +44,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 @@ -71,6 +69,7 @@ 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 ### Floating IP addresses ### @@ -84,7 +83,7 @@ parameters: dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE dns_float_ip: PUT DNS FLOATING IP HERE - mso_float_ip: PUT MSO FLOATING IP HERE + so_float_ip: PUT SO FLOATING IP HERE mr_float_ip: PUT MESSAGE ROUTER FLOATING IP HERE policy_float_ip: PUT POLICY FLOATING IP HERE portal_float_ip: PUT PORTAL FLOATING IP HERE @@ -93,11 +92,10 @@ parameters: sdnc_float_ip: PUT SDN-C FLOATING IP HERE vid_float_ip: PUT VID FLOATING IP HERE clamp_float_ip: PUT CLAMP FLOATING IP HERE - + openo_float_ip: PUT OPEN-O FLOATING IP HERE ### 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 @@ -108,7 +106,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 @@ -117,6 +115,7 @@ parameters: 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 ########################### # # @@ -138,6 +137,45 @@ parameters: 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.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 + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + ##################### # # # ONAP repositories # @@ -147,7 +185,7 @@ parameters: 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 @@ -155,3 +193,4 @@ 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 + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git |