X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=3382d2a4bd8595a54651f51b927d638697325904;hb=315351323c8c3534bdae10e54df21f0f7b6896d8;hp=0d7705431b88a0981cbbdefdc2e49dbb1b5d6118;hpb=f0cca0d30e18e1c9ca2b753a27738cc2f858bf27;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 0d770543..3382d2a4 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,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, R2MVP, R2, or R2PLUS) - 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) ################################ # # @@ -135,30 +119,34 @@ parameters: music_branch: master nbi_branch: master aaf_branch: master + sms_branch: master oof_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: v1.2.0 - portal_docker: 2.1-STAGING-latest - robot_docker: 1.2-STAGING-latest + policy_docker: 1.2.2 + portal_docker: v2.2.0 + robot_docker: 1.2.0 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 + 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-SNAPSHOT-STAGING-latest - dgbuilder_docker: 0.2.1-SNAPSHOT + dgbuilder_docker: 0.2-STAGING-latest cli_docker: 2.0-STAGING-latest music_docker: latest oof_docker: latest aaf_docker: 2.1.0-SNAPSHOT + sms_docker: latest nbi_docker: latest + dbcl_docker: latest dcae_docker: 1.1.2 dcae_snmptrap_docker: latest @@ -176,8 +164,8 @@ parameters: dcae_sch_docker: latest dcae_heartbeat_docker: latest dcae_prh_docker: latest - holmes_rm_docker: v1.0.0 - holmes_em_docker: v1.0.0 + holmes_rm_docker: latest + holmes_em_docker: latest vfc_nokia_docker: 1.1.0-STAGING-latest vfc_nokiav2_docker: 1.1.0-STAGING-latest @@ -197,16 +185,6 @@ parameters: 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 - ##################### # # # ONAP repositories # @@ -214,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 @@ -227,4 +205,5 @@ parameters: 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