X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=7771a02c87576548dd7d7ce6fcef0fdc7272da36;hb=b8446958da0ed045e64026405cc64d74d8604b3c;hp=5c11425fec131564ac5554691bcd744e959d8662;hpb=933d38cafe20148824e0ca28f1bd90bc1a003843;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 5c11425f..7771a02c 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.3.0 openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -48,18 +44,18 @@ parameters: openstack_username: PUT YOUR OPENSTACK USERNAME HERE - openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE - - openstack_auth_method: password + openstack_api_key: PUT YOUR ENCRYPTED OPENSTACK PASSWORD HERE 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 + http_proxy: PUT YOUR HTTP PROXY ADDRESS (if you don't work behind a proxy put no_proxy) + + https_proxy: PUT YOUR HTTPS PROXY ADDRESS (if you don't work behind a proxy put no_proxy) + ###################### # # @@ -88,10 +84,11 @@ parameters: sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 - openo_ip_addr: 10.0.14.1 + multiserv_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 ########################### @@ -100,18 +97,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 (R3MVP, R3, or R3PLUS) ################################ # # @@ -126,7 +112,6 @@ parameters: mr_branch: master policy_branch: master portal_branch: master - robot_branch: master sdc_branch: master sdnc_branch: master vid_branch: master @@ -135,69 +120,82 @@ 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 - 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-SNAPSHOT - mvim_openstack_docker: 1.1.2-SNAPSHOT - 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: 2.0-STAGING-latest - music_docker: latest - oof_docker: latest - aaf_docker: 2.1.0-SNAPSHOT - 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 + aai_docker: "1.2.2" + appc_docker: "1.4.0-SNAPSHOT-latest" + so_docker: "1.3.0-STAGING-latest" + policy_docker: "1.3-SNAPSHOT-latest" + portal_docker: "2.2.0" + robot_docker: "1.3.1-STAGING-latest" + sniro_docker: "1.0.0" + sdc_docker: "1.3-STAGING-latest" + sdnc_docker: "1.4-STAGING-latest" + vid_docker: "3.0-STAGING-latest" + clamp_docker: "3.0-STAGING-latest" + msb_docker: "1.2.0-STAGING-latest" + mvim_docker: "1.2.0-STAGING" + mvim_openstack_docker: "1.2.0-STAGING" + uui_docker: "1.1.1" + esr_docker: "1.1.0" + sdc_wfd_docker: "1.1.0" + dgbuilder_docker: "0.3-STAGING-latest" + ansible_docker: "0.3.0" + cli_docker: "2.0.2" + music_docker: "2.5.3" + cassandra_music_docker: "3.0.0" + optf_has_docker: "1.2.1" + optf_osdf_docker: "1.2.1" + aaf_docker: "2.1.2-SNAPSHOT" + sms_docker: "2.0.0" + nbi_docker: "3.0.1" + dbcl_docker: "1.0.12" + + dcae_docker: "1.1.3" + dcae_bootstrap_docker: "1.1.3" + dcae_k8sbootstrap_docker: "1.4.2" + dcae_redisc_docker: "1.0.0" + dcae_hc_docker: "1.1.0" + dcae_tls_docker: "1.0.0" + dcae_cb_docker: "4.1.0" + dcae_snmptrap_docker: "1.4.0" + dcae_ves_docker: "1.3.1" + dcae_hvves_docker: "1.0.0-SNAPSHOT" + dcae_datafile_docker: "1.0.0" + dcae_cm_docker: "1.4.1" + dcae_tca_docker: "1.1.0" + dcae_tca2_docker: "1.0.0" + dcae_cbs_docker: "2.2.3" + dcae_dh_docker: "3.0.2" + dcae_inv_docker: "3.0.4" + dcae_ph_docker: "4.3.1" + dcae_sch_docker: "1.1.5" + dcae_prh_docker: "1.0.0" + dcae_heartbeat_docker: "1.3.0" + dcae_mua_docker: "0.0.1" + dcae_msnmp_docker: "latest" + holmes_rm_docker: "1.2.0-STAGING-latest" + holmes_em_docker: "1.2.0-STAGING-latest" + + vfc_db_docker: "1.1.0-STAGING-latest" + 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" ##################### # # @@ -206,11 +204,10 @@ 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/dmaap/messagerouter/messageservice.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 - robot_repo: http://gerrit.onap.org/r/testsuite/properties.git sdc_repo: http://gerrit.onap.org/r/sdc.git sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git vid_repo: http://gerrit.onap.org/r/vid.git @@ -219,4 +216,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