X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=96359bf980d488446bbc6e8f3224067a4b78330f;hb=8ac3f668addaf53f9b6ad4dbae0fd28938ba0a42;hp=da446ada164d4705875cce4eedef17f7650a5757;hpb=b2287e9401f9538d11a902b606a1e2b14cb51d69;p=demo.git diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index da446ada..96359bf9 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-SNAPSHOT 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) ################################ # # @@ -110,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 @@ -122,68 +123,79 @@ parameters: 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.3 - 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: latest - sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest - dgbuilder_docker: 0.2-STAGING-latest - cli_docker: 2.0.2 - 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 + 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: "2.0.0" + 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