X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=7771a02c87576548dd7d7ce6fcef0fdc7272da36;hb=b8446958da0ed045e64026405cc64d74d8604b3c;hp=ccbe63d1bc2a8f4c59862df67c7633b964f28c7c;hpb=c7fb887784ce9ec47a44a15be753abc5d1d580a7;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index ccbe63d1..7771a02c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -36,7 +36,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.1-SNAPSHOT + artifacts_version: 1.3.0 openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -44,9 +44,7 @@ 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 @@ -54,6 +52,10 @@ parameters: 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) + ###################### # # @@ -82,7 +84,7 @@ 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 @@ -95,7 +97,7 @@ parameters: # # ########################### - dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS) + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R3MVP, R3, or R3PLUS) ################################ # # @@ -108,9 +110,8 @@ parameters: appc_branch: master so_branch: master mr_branch: master - policy_branch: beijing + policy_branch: master portal_branch: master - robot_branch: master sdc_branch: master sdnc_branch: master vid_branch: master @@ -122,68 +123,79 @@ parameters: sms_branch: master oof_branch: master - aai_docker: 1.2.2 - aai_sparky_docker: 1.2.2 - appc_docker: 1.3.0 - so_docker: 1.2.2 - policy_docker: 1.2.3 - portal_docker: v2.2.0 - robot_docker: 1.2.1 - sdc_docker: 1.2.0 - sdnc_docker: 1.3.4 - vid_docker: 2.0.0 - clamp_docker: 2.0.2 - msb_docker: 1.1.0 - 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 - dgbuilder_docker: 0.2.4 - cli_docker: 2.0.2 - music_docker: latest - oof_docker: 1.1.1 - aaf_docker: 2.1.1 - sms_docker: latest - nbi_docker: 2.0.0 - dbcl_docker: 1.0.12 - - dcae_docker: 1.1.3 - dcae_snmptrap_docker: 1.3.0 - dcae_ves_docker: 1.2.0 - dcae_bootstrap_docker: 1.1.3 - dcae_cm_docker: 1.3.0 - dcae_k8sbootstrap_docker: 1.1.11 - dcae_redisc_docker: 1.0.0 - dcae_tca_docker: 1.1.0 - dcae_cb_docker: 4.1.0 - dcae_cbs_docker: 2.1.5 - dcae_dh_docker: 2.1.5 - dcae_inv_docker: 3.0.1 - dcae_ph_docker: 2.4.5 - dcae_sch_docker: 1.1.4 - dcae_heartbeat_docker: latest - dcae_prh_docker: latest - holmes_rm_docker: 1.1.0 - holmes_em_docker: 1.1.0 - - 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 + 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" ##################### # # @@ -196,7 +208,6 @@ parameters: 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