X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=b4200a0ae72e5aeb002a2a6038e7abe1bc439818;hb=ec750e27d17e91a0a431973155421b6ca952b1b1;hp=721fd9d75ebcd2db87b7ede26ed78743c121c80d;hpb=e0193690af1cd70026b5693c0138857e2a504111;p=demo.git diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 721fd9d7..b4200a0a 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.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, 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) ################################ # # @@ -120,22 +104,23 @@ 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 - nbi_branch: master - aaf_branch: master - oof_branch: master + aai_branch: 2.0.0-ONAP + appc_branch: 2.0.0-ONAP + so_branch: 2.0.0-ONAP + mr_branch: 2.0.0-ONAP + policy_branch: 2.0.0-ONAP + portal_branch: 2.0.0-ONAP + robot_branch: 2.0.0-ONAP + sdc_branch: 2.0.0-ONAP + sdnc_branch: 2.0.0-ONAP + vid_branch: 2.0.0-ONAP + clamp_branch: 2.0.0-ONAP + vnfsdk_branch: 2.0.0-ONAP + music_branch: 2.0.0-ONAP + nbi_branch: 2.0.0-ONAP + aaf_branch: 2.0.0-ONAP + sms_branch: 2.0.0-ONAP + oof_branch: 2.0.0-ONAP aai_docker: ${AAI_RESOURCES_DOCKER} aai_sparky_docker: ${AAI_RESOURCES_DOCKER} @@ -144,22 +129,27 @@ parameters: policy_docker: ${POLICY_PE_DOCKER} portal_docker: ${PORTAL_APP_DOCKER} robot_docker: ${TESTSUITE_DOCKER} + sniro_docker: ${SNIROEMULATOR_DOCKER} sdc_docker: ${SDC_BACKEND_DOCKER} sdnc_docker: ${SDNC_IMAGE_DOCKER} vid_docker: ${VID_DOCKER} clamp_docker: ${CLAMP_DOCKER} msb_docker: ${MSB_APIGATEWAY_DOCKER} mvim_docker: ${FRAMEWORK_DOCKER} + mvim_openstack_docker: ${OPENSTACK_OCATA_DOCKER} uui_docker: ${USECASE_UI_SERVER_DOCKER} esr_docker: ${ESR_SERVER_DOCKER} sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER} dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER} cli_docker: ${CLI_DOCKER} music_docker: ${MUSIC_DOCKER} - oof_docker: ${OOF_DOCKER} - aaf_docker: ${AAF_DOCKER} + cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER} + optf_has_docker: ${OPTF_HAS_DOCKER} + optf_osdf_docker: ${OPTF_OSDF_DOCKER} + aaf_docker: ${AAF_SERVICE_DOCKER} + sms_docker: ${SMS_DOCKER} nbi_docker: ${NBI_DOCKER} - dbcl_docker: ${DBCL_DOCKER} + dbcl_docker: ${BUSCONTROLLER_DOCKER} dcae_docker: ${BOOTSTRAP_DOCKER} dcae_snmptrap_docker: ${SNMPTRAP_DOCKER} @@ -175,8 +165,6 @@ parameters: dcae_inv_docker: ${INVENTORY_API_DOCKER} dcae_ph_docker: ${POLICY_HANDLER_DOCKER} dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER} - dcae_heartbeat_docker: ${HEARTBEAT_DOCKER} - dcae_prh_docker: ${PRH_APP_SERVER_DOCKER} holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER} holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER} @@ -198,16 +186,6 @@ parameters: vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER} vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER} - ############################################ - # # - # 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 # @@ -215,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 @@ -228,4 +206,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 - oof_repo: http://gerrit.onap.org/r/optf/has.git \ No newline at end of file + sms_repo: http://gerrit.onap.org/r/aaf/sms.git + oof_repo: http://gerrit.onap.org/r/optf/has.git