X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=a79a188d6042fc882d25855ef6bcaad3299d7101;hb=995654ad4d923af5ad3639ae352beb5c6d29f65b;hp=189dfd27838c752d89c999b33470cac96f0171b4;hpb=c4e488b0e69567f49c1f5b17efa288116d125fe5;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 189dfd27..f9ac9911 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -6,14 +6,14 @@ 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 ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE - centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE - flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -22,22 +22,12 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE - flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE - - security_group: PUT THE NAME OF THE SECURITY GROUP HERE - - vm_base_name: vm1 + vm_base_name: onap key_name: onap_key - dcae_key_name: dcae_key - pub_key: PUT YOUR PUBLIC KEY HERE - dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE - - nexus_repo: https://nexus.onap.org/content/sites/raw - nexus_docker_repo: nexus3.onap.org:10001 nexus_username: docker @@ -46,10 +36,12 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.1.0-SNAPSHOT + artifacts_version: 1.2.1 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 @@ -58,8 +50,6 @@ parameters: openstack_region: RegionOne - horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -73,6 +63,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 + 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 ### @@ -81,11 +72,6 @@ parameters: 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 so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 @@ -97,12 +83,11 @@ parameters: 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 - 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 + music_ip_addr: 10.0.15.1 + oof_ip_addr: 10.0.16.1 + aaf_ip_addr: 10.0.13.1 + sms_ip_addr: 10.0.13.2 + nbi_ip_addr: 10.0.17.1 ########################### # # @@ -110,60 +95,96 @@ 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 - + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS) ################################ # # # Docker versions and branches # + # Generated using onap_openstack_template.env and manifest-to-env.sh # # ################################ - 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-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 - esr_docker: latest - dgbuilder_docker: 0.1-STAGING-latest - cli_docker: 1.1-STAGING-latest + aai_branch: beijing + appc_branch: beijing + so_branch: beijing + mr_branch: beijing + policy_branch: beijing + portal_branch: beijing + robot_branch: beijing + sdc_branch: beijing + sdnc_branch: beijing + vid_branch: beijing + clamp_branch: beijing + vnfsdk_branch: beijing + music_branch: beijing + nbi_branch: beijing + aaf_branch: beijing + sms_branch: beijing + oof_branch: beijing + + aai_docker: 1.2.2 + aai_sparky_docker: 1.2.2 + appc_docker: 1.3.0 + so_docker: 1.2.2 + policy_docker: 1.2.3 + portal_docker: 2.2.0 + robot_docker: 1.2.1 + sniro_docker: 1.0.0 + sdc_docker: 1.2.0 + sdnc_docker: 1.3.4 + vid_docker: 2.0.0 + clamp_docker: 2.0.2 + msb_docker: 1.1.0 + mvim_docker: 1.1.2 + mvim_openstack_docker: 1.1.2 + uui_docker: 1.1.1 + esr_docker: 1.1.0 + sdc_wfd_docker: 1.1.0 + dgbuilder_docker: 0.2.4 + cli_docker: 2.0.2 + music_docker: 2.5.3 + cassandra_music_docker: 3.0.0 + optf_has_docker: 1.1.1 + optf_osdf_docker: 1.1.1 + aaf_docker: 2.1.1 + sms_docker: 2.0.0 + nbi_docker: 2.0.0 + dbcl_docker: 1.0.12 + + dcae_docker: 1.1.3 + dcae_snmptrap_docker: 1.3.0 + dcae_ves_docker: 1.2.0 + dcae_bootstrap_docker: 1.1.3 + dcae_cm_docker: 1.3.0 + dcae_k8sbootstrap_docker: 1.1.11 + dcae_redisc_docker: 1.0.0 + dcae_tca_docker: 1.1.0 + dcae_cb_docker: 4.1.0 + dcae_cbs_docker: 2.1.5 + dcae_dh_docker: 2.1.5 + dcae_inv_docker: 3.0.1 + dcae_ph_docker: 2.4.5 + dcae_sch_docker: 1.1.4 + holmes_rm_docker: 1.1.0 + holmes_em_docker: 1.1.0 + + vfc_nokia_docker: 1.1.0 + vfc_nokiav2_docker: 1.1.0 + vfc_ztevnfmdriver_docker: 1.1.0 + vfc_ztesdncdriver_docker: 1.1.0 + vfc_vnfres_docker: 1.1.0 + vfc_vnfmgr_docker: 1.1.0 + vfc_vnflcm_docker: 1.1.0 + vfc_resmanagement_docker: 1.1.0 + vfc_nslcm_docker: 1.1.0 + vfc_huawei_docker: 1.1.0 + vfc_jujudriver_docker: 1.1.0 + vfc_gvnfmdriver_docker: 1.1.0 + vfc_emsdriver_docker: 1.1.0 + vfc_catalog_docker: 1.1.0 + vfc_wfengine_mgrservice_docker: 1.1.0 + vfc_wfengine_activiti_docker: 1.1.0 + vfc_multivimproxy_docker: 1.0.0 ##################### # # @@ -172,8 +193,7 @@ parameters: ##################### 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 + mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.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 @@ -183,3 +203,8 @@ parameters: 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 + music_repo: http://gerrit.onap.org/r/music.git + nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git + aaf_repo: http://gerrit.onap.org/r/aaf/authz.git + sms_repo: http://gerrit.onap.org/r/aaf/sms.git + oof_repo: http://gerrit.onap.org/r/optf/has.git