X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=2b95c4a7f0232bf226940df96c822db6eb661925;hb=82c066900616808b14489d57d2b2edcf2f0e9e82;hp=74a9c8ed76ff35b5894ab3524deaf299b826fe31;hpb=14b4f1d5c02629d7c8ffa4ba5114349961278c88;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 74a9c8ed..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 @@ -42,6 +44,8 @@ parameters: 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 @@ -52,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 @@ -65,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 + 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 ### @@ -73,11 +78,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 @@ -90,32 +90,23 @@ parameters: 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 - ########################### # # # Parameters used by DCAE # # # ########################### - 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 - + 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 ################################ # # @@ -127,33 +118,49 @@ parameters: appc_branch: master so_branch: master mr_branch: master - dcae_branch: master policy_branch: master - portal_branch: master + portal_branch: release-1.3.0 robot_branch: master - sdc_branch: master - sdnc_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: 1.1-STAGING-latest + aai_docker: v1.1.0 + aai_sparky_docker: v1.0.0 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 + 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: 1.1-STAGING-latest - clamp_docker: 1.1-STAGING-latest - msb_docker: latest + vid_docker: v1.1.0 + clamp_docker: v1.1.0 + msb_docker: v1.0.0 mvim_docker: latest - vfc_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 ##################### # # @@ -162,7 +169,6 @@ 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 so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git