X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=6238bc2c64719d1d8ee6b558672073fa5489a104;hb=57e593994acfc8426dbb1a0f21b6e365acf35e1f;hp=99622120c24d6bd7e7db9816867b0d1394ed70f3;hpb=211404cb8cae487e4f343e4deaced01ea202a186;p=demo.git diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 99622120..6238bc2c 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.1.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 @@ -89,6 +83,11 @@ parameters: vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 openo_ip_addr: 10.0.14.1 + 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 ########################### # # @@ -96,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) ################################ # # @@ -119,36 +108,68 @@ parameters: appc_branch: master so_branch: master mr_branch: master - policy_branch: master - portal_branch: release-1.3.0 + policy_branch: beijing + 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 + sms_branch: master + oof_branch: master aai_docker: ${AAI_RESOURCES_DOCKER} aai_sparky_docker: ${AAI_RESOURCES_DOCKER} appc_docker: ${APPC_IMAGE_DOCKER} so_docker: ${MSO_DOCKER} - dcae_docker: ${BOOTSTRAP_DOCKER} - policy_docker: ${POLICY_DB_DOCKER} - portal_docker: ${PORTAL_APPS_DOCKER} - robot_docker: 1.1-STAGING-latest + policy_docker: ${POLICY_PE_DOCKER} + portal_docker: ${PORTAL_APP_DOCKER} + robot_docker: ${TESTSUITE_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: ${OPTF_OSDF_DOCKER} + aaf_docker: ${AAF_SERVICE_DOCKER} + sms_docker: ${SMS_DOCKER} + nbi_docker: ${NBI_DOCKER} + dbcl_docker: ${BUSCONTROLLER_DOCKER} + + dcae_docker: ${BOOTSTRAP_DOCKER} + dcae_snmptrap_docker: ${SNMPTRAP_DOCKER} + dcae_ves_docker: ${VESCOLLECTOR_DOCKER} + dcae_bootstrap_docker: ${BOOTSTRAP_DOCKER} + dcae_cm_docker: ${CM_CONTAINER_DOCKER} + dcae_k8sbootstrap_docker: ${K8S_BOOTSTRAP_CONTAINER_DOCKER} + dcae_redisc_docker: ${REDIS_CLUSTER_CONTAINER_DOCKER} + dcae_tca_docker: ${TCA_CDAP_CONTAINER_DOCKER} + dcae_cb_docker: ${CDAPBROKER_DOCKER} + dcae_cbs_docker: ${CONFIGBINDING_DOCKER} + dcae_dh_docker: ${DEPLOYMENT_HANDLER_DOCKER} + 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} vfc_nokia_docker: ${NOKIA_DOCKER} - vfc_ztevmanagerdriver_docker: ${ZTEVMANAGERDRIVER_DOCKER} + vfc_nokiav2_docker: ${NOKIAV2_DOCKER} + vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER} vfc_ztesdncdriver_docker: ${ZTESDNCDRIVER_DOCKER} vfc_vnfres_docker: ${VNFRES_DOCKER} vfc_vnfmgr_docker: ${VNFMGR_DOCKER} @@ -162,6 +183,7 @@ parameters: vfc_catalog_docker: ${CATALOG_DOCKER} vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER} vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER} + vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER} ##################### # # @@ -170,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 @@ -180,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