X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=db18ee2f581ea9ce207185dc39b0961b74e5cf85;hb=10e2bdaa7d5174731986f625bab06e9f41337b12;hp=3a64fca7502b65de967d419cf60a80305839e477;hpb=c0e48e2923af5ea1e77d8741d695ce5553d22ab3;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 3a64fca7..db18ee2f 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -24,7 +24,7 @@ parameters: flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE - vm_base_name: vm1 + vm_base_name: onap key_name: onap_key @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.1.0-SNAPSHOT + artifacts_version: 1.2.0-SNAPSHOT openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -78,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 @@ -94,12 +89,10 @@ 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 + nbi_ip_addr: 10.0.17.1 ########################### # # @@ -107,20 +100,7 @@ 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 (R1 or R2MVP) 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 @@ -136,6 +116,7 @@ parameters: ################################ # # # Docker versions and branches # + # Generated using onap_openstack_template.env and manifest-to-env.sh # # ################################ @@ -143,35 +124,86 @@ parameters: appc_branch: master so_branch: master mr_branch: master - dcae_branch: master policy_branch: master - portal_branch: release-1.3.0 + 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: 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 - mvim_docker: latest - vfc_docker: latest - uui_docker: latest - esr_docker: latest - dgbuilder_docker: 0.1-STAGING-latest + music_branch: master + nbi_branch: master + + aai_docker: 1.2-STAGING-latest + aai_sparky_docker: 1.2-STAGING-latest + appc_docker: 1.3.0-SNAPSHOT-latest + so_docker: 1.2.1 + policy_docker: 1.2-STAGING-latest + portal_docker: 2.1-STAGING-latest + robot_docker: 1.2-STAGING-latest + sdc_docker: 1.2-STAGING-latest + sdnc_docker: 1.3-STAGING-latest + vid_docker: 1.2.1 + clamp_docker: 2.0-STAGING-latest + msb_docker: 1.1.0-STAGING-latest + mvim_docker: v1.0.0 + uui_docker: 1.1.0-SNAPSHOT-STAGING-latest + esr_docker: 1.1.0-SNAPSHOT + sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest + dgbuilder_docker: 0.2.1-SNAPSHOT cli_docker: v1.1.0 + music_docker: latest + oof_docker: latest + aaf_docker: latest + nbi_docker: latest + + dcae_docker: 1.1.2 + dcae_snmptrap_docker: latest + dcae_ves_docker: latest + dcae_bootstrap_docker: 1.1.2 + dcae_cm_docker: latest + dcae_k8sbootstrap_docker: latest + dcae_redisc_docker: latest + dcae_tca_docker: latest + dcae_cb_docker: v4.0.0 + dcae_cbs_docker: latest + dcae_dh_docker: latest + dcae_inv_docker: latest + dcae_ph_docker: latest + dcae_sch_docker: latest + dcae_heartbeat_docker: latest + dcae_prh_docker: latest + holmes_rm_docker: v1.0.0 + holmes_em_docker: v1.0.0 + + vfc_nokia_docker: 1.1.0-STAGING-latest + vfc_nokiav2_docker: 1.1.0-STAGING-latest + vfc_ztevnfmdriver_docker: 1.1.0-STAGING-latest + vfc_ztesdncdriver_docker: 1.1.0-STAGING-latest + vfc_vnfres_docker: 1.1.0-STAGING-latest + vfc_vnfmgr_docker: 1.1.0-STAGING-latest + vfc_vnflcm_docker: 1.1.0-STAGING-latest + vfc_resmanagement_docker: 1.1.0-STAGING-latest + vfc_nslcm_docker: 1.1.0-STAGING-latest + vfc_huawei_docker: 1.1.0-STAGING-latest + vfc_jujudriver_docker: 1.1.0-STAGING-latest + vfc_gvnfmdriver_docker: 1.1.0-STAGING-latest + vfc_emsdriver_docker: 1.1.0-STAGING-latest + vfc_catalog_docker: 1.1.0-STAGING-latest + vfc_wfengine_mgrservice_docker: latest + vfc_wfengine_activiti_docker: latest + vfc_multivimproxy_docker: 1.0.0-STAGING-latest + + ############################################ + # # + # Parameters used by Nokia v2 SVNFM driver # + # # + ############################################ + + cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM + cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM + cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM ##################### # # @@ -180,7 +212,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 @@ -191,3 +222,5 @@ 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