X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=f9ac99118067db1c010b1de747d601f2a5626c8b;hb=995654ad4d923af5ad3639ae352beb5c6d29f65b;hp=ccd67fe93bdfd2c81c0531bda23b3c1a7fc44b88;hpb=5ffbe17470b0a014b1948b526ad0faf7a249cdd6;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index ccd67fe9..f9ac9911 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 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,7 @@ 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 ########################### @@ -100,18 +95,7 @@ parameters: # # ########################### - 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 - 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) ################################ # # @@ -120,71 +104,87 @@ parameters: # # ################################ - aai_branch: master - appc_branch: master - so_branch: master - mr_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 - music_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 - dcae_docker: v1.1.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 - - 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 + 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 ##################### # # @@ -193,7 +193,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 @@ -204,3 +204,7 @@ parameters: 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