X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=68be91e60dcdd27478ed41c1221a78283758e074;hb=0f671db5d7e103befe6cd4c4874ddd92a0ebebfd;hp=7da7120db719397316df3ed315ecd62a17dee493;hpb=a95486d0e7b647f95c4b32a7f4f36a669371c089;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 7da7120d..68be91e6 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.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,6 +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 @@ -111,6 +111,7 @@ parameters: ################################ # # # Docker versions and branches # + # Generated using onap_openstack_template.env and manifest-to-env.sh # # ################################ @@ -119,48 +120,81 @@ parameters: so_branch: master mr_branch: master policy_branch: master - portal_branch: release-1.3.0 + portal_branch: master robot_branch: master sdc_branch: master sdnc_branch: master vid_branch: master clamp_branch: master vnfsdk_branch: master - - aai_docker: v1.1.0 - aai_sparky_docker: v1.0.0 - appc_docker: v1.2.0 - so_docker: v1.1.1 - dcae_docker: v1.1.0 - policy_docker: v1.1.1 - portal_docker: v1.3.0 - robot_docker: 1.1-STAGING-latest - sdc_docker: 1.1-STAGING-latest - sdnc_docker: 1.2-STAGING-latest - vid_docker: v1.1.0 - clamp_docker: v1.1.0 - msb_docker: 1.0.0 - mvim_docker: latest + 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: 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: 1.1.2-STAGING + mvim_openstack_docker: 1.1.2-SNAPSHOT uui_docker: latest - esr_docker: v1.0.0 - dgbuilder_docker: v0.1.0 - cli_docker: v1.1.0 - - vfc_nokia_docker: v1.0.2 - vfc_ztevmanagerdriver_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 + esr_docker: latest + sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest + 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 + dcae_ves_docker: latest + dcae_bootstrap_docker: 1.1.2 + dcae_cm_docker: latest + dcae_k8sbootstrap_docker: latest + dcae_redisc_docker: latest + dcae_tca_docker: latest + dcae_cb_docker: v4.0.0 + dcae_cbs_docker: latest + dcae_dh_docker: latest + dcae_inv_docker: latest + dcae_ph_docker: latest + dcae_sch_docker: latest + dcae_heartbeat_docker: latest + dcae_prh_docker: latest + holmes_rm_docker: latest + holmes_em_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 ##################### # # @@ -169,7 +203,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 @@ -179,3 +213,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