X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=2b95c4a7f0232bf226940df96c822db6eb661925;hb=82c066900616808b14489d57d2b2edcf2f0e9e82;hp=b94bcca20f6c490be6146e2f8975ae2b29253cf5;hpb=a94e309943d51a2d56e9aa19a582ac9eb40966e6;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index b94bcca2..2b95c4a7 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -6,7 +6,9 @@ parameters: # # ############################################## - public_net_id: PUT YOUR NETWORK ID/NAME HERE + public_net_id: PUT YOUR NETWORK ID HERE + + public_net_name: PUT YOUR NETWORK NAME HERE ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE @@ -20,6 +22,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,12 +42,10 @@ 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_tenant_name: PUT YOUR OPENSTACK PROJECT NAME HERE + openstack_username: PUT YOUR OPENSTACK USERNAME HERE openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE @@ -54,7 +56,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -67,21 +69,17 @@ 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 + dns_forwarder: PUT THE IP OF DNS FORWARDER FOR ONAP DEPLOYMENT'S OWN DNS SERVER + 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 dcae_ip_addr: 10.0.4.1 - dcae_coll_ip_addr: 10.0.4.102 - dcae_db_ip_addr: 10.0.4.101 - dcae_hdp1_ip_addr: 10.0.4.103 - 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,12 +87,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 - - dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE - dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE - dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE - dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE - dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 ########################### # # @@ -102,16 +96,86 @@ parameters: # # ########################### - dcae_base_environment: 1-NIC-FLOATING-IPS - - dcae_zone: ZONE - - dcae_state: STATE - - nexus_repo_root: https://nexus.onap.org - - nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots - - gitlab_branch: master - - dcae_code_version: 1.1.0 \ No newline at end of file + dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE + dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE + dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE + dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name) + dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE + dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE + dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE + dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM + dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER + dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS + dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + 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.0 + 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 + clamp_docker: v1.1.0 + msb_docker: v1.0.0 + mvim_docker: latest + uui_docker: latest + esr_docker: v1.0.0 + dgbuilder_docker: 0.1-STAGING-latest + cli_docker: v1.1.0 + + vfc_nokia_docker: v1.0.0 + vfc_ztevmanagerdriver_docker: v1.0.1 + vfc_ztesdncdriver_docker: v1.0.1 + 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_jujudriver_docker: v1.0.0 + vfc_gvnfmdriver_docker: v1.0.1 + vfc_emsdriver_docker: v1.0.1 + vfc_catalog_docker: v1.0.1 + vfc_wfengine_mgrservice_docker: v1.0.0 + vfc_wfengine_activiti_docker: v1.0.0 + + ##################### + # # + # ONAP repositories # + # # + ##################### + aai_repo: http://gerrit.onap.org/r/aai/test-config + appc_repo: http://gerrit.onap.org/r/appc/deployment.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