X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=ccbe63d1bc2a8f4c59862df67c7633b964f28c7c;hb=c7fb887784ce9ec47a44a15be753abc5d1d580a7;hp=adc3e40b1f76b5763a521b4524a0c7b23e98f9be;hpb=5ffa04f5a89192ec47f23faa83fae16d3b537ad6;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index adc3e40b..ccbe63d1 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -22,16 +22,12 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE - flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE - vm_base_name: onap key_name: onap_key pub_key: PUT YOUR PUBLIC KEY HERE - nexus_repo: https://nexus.onap.org/content/sites/raw - nexus_docker_repo: nexus3.onap.org:10001 nexus_username: docker @@ -40,7 +36,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -54,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 @@ -92,6 +86,8 @@ parameters: 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 ########################### # # @@ -99,17 +95,7 @@ parameters: # # ########################### - 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 + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS) ################################ # # @@ -122,7 +108,7 @@ parameters: appc_branch: master so_branch: master mr_branch: master - policy_branch: master + policy_branch: beijing portal_branch: master robot_branch: master sdc_branch: master @@ -130,44 +116,74 @@ parameters: vid_branch: master clamp_branch: master vnfsdk_branch: master - - aai_docker: 1.2-STAGING-latest - aai_sparky_docker: 1.2-STAGING-latest - appc_docker: v1.2.0 - so_docker: v1.1.1 - dcae_docker: v1.1.1 - policy_docker: v1.1.1 - portal_docker: v1.3.0 - robot_docker: 1.1-STAGING-latest - sdc_docker: v1.1.0 - sdnc_docker: v1.2.1 - vid_docker: 1.2.1 - clamp_docker: 2.0-STAGING-latest - msb_docker: 1.0.0 - mvim_docker: v1.0.0 - uui_docker: v1.0.1 - esr_docker: v1.0.0 - dgbuilder_docker: v0.1.0 - cli_docker: v1.1.0 + music_branch: master + nbi_branch: master + aaf_branch: master + sms_branch: master + oof_branch: master + + 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: v2.2.0 + robot_docker: 1.2.1 + 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-STAGING + mvim_openstack_docker: 1.1.2-SNAPSHOT + uui_docker: latest + esr_docker: latest + sdc_wfd_docker: 1.1.0 + dgbuilder_docker: 0.2.4 + cli_docker: 2.0.2 music_docker: latest - oof_docker: latest - aaf_docker: latest - - vfc_nokia_docker: v1.0.2 - vfc_ztevnfmdriver_docker: v1.0.2 - vfc_ztesdncdriver_docker: v1.0.0 - 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.2 - vfc_huawei_docker: v1.0.2 - vfc_jujudriver_docker: v1.0.0 - vfc_gvnfmdriver_docker: v1.0.1 - vfc_emsdriver_docker: v1.0.1 - vfc_catalog_docker: v1.0.2 - vfc_wfengine_mgrservice_docker: v1.0.0 - vfc_wfengine_activiti_docker: v1.0.0 + oof_docker: 1.1.1 + aaf_docker: 2.1.1 + sms_docker: latest + 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 + dcae_heartbeat_docker: latest + dcae_prh_docker: latest + 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 ##################### # # @@ -176,7 +192,7 @@ parameters: ##################### 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 + 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 @@ -186,3 +202,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