X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=13ed5071941a96f80fc118ebd50bd02040df8df8;hb=8c1c99dfc4a42ff8e438a13858c95340a0f677c7;hp=c6a938130e2e4b147a278328757fbd391a04c8ad;hpb=12f6d79d758048a7acd0615d1eee01686f05fd06;p=demo.git diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index c6a93813..13ed5071 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -36,7 +36,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.1 + 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 @@ -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,69 +123,69 @@ parameters: 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} - policy_docker: ${POLICY_PE_DOCKER} - portal_docker: ${PORTAL_APP_DOCKER} - robot_docker: ${TESTSUITE_DOCKER} - sniro_docker: ${SNIROEMULATOR_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} - cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER} - optf_has_docker: ${OPTF_HAS_DOCKER} - optf_osdf_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} - holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER} - holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER} - - vfc_nokia_docker: ${NOKIA_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} - vfc_vnflcm_docker: ${VNFLCM_DOCKER} - vfc_resmanagement_docker: ${RESMANAGEMENT_DOCKER} - vfc_nslcm_docker: ${NSLCM_DOCKER} - vfc_huawei_docker: ${HUAWEI_DOCKER} - vfc_jujudriver_docker: ${JUJUDRIVER_DOCKER} - vfc_gvnfmdriver_docker: ${GVNFMDRIVER_DOCKER} - vfc_emsdriver_docker: ${EMSDRIVER_DOCKER} - vfc_catalog_docker: ${CATALOG_DOCKER} - vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER} - vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER} - vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER} + aai_docker: "${AAI_RESOURCES_DOCKER}" + appc_docker: "${APPC_IMAGE_DOCKER}" + so_docker: "${API_HANDLER_INFRA_DOCKER}" + policy_docker: "${POLICY_PE_DOCKER}" + portal_docker: "${PORTAL_APP_DOCKER}" + robot_docker: "${TESTSUITE_DOCKER}" + sniro_docker: "${SNIROEMULATOR_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}" + cassandra_music_docker: "${CASSANDRA_MUSIC_DOCKER}" + optf_has_docker: "${OPTF_HAS_DOCKER}" + optf_osdf_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}" + holmes_rm_docker: "${RULE_MANAGEMENT_DOCKER}" + holmes_em_docker: "${ENGINE_MANAGEMENT_DOCKER}" + + vfc_db_docker: "${DB_DOCKER}" + vfc_nokia_docker: "${NOKIA_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}" + vfc_vnflcm_docker: "${VNFLCM_DOCKER}" + vfc_resmanagement_docker: "${RESMANAGEMENT_DOCKER}" + vfc_nslcm_docker: "${NSLCM_DOCKER}" + vfc_huawei_docker: "${HUAWEI_DOCKER}" + vfc_jujudriver_docker: "${JUJUDRIVER_DOCKER}" + vfc_gvnfmdriver_docker: "${GVNFMDRIVER_DOCKER}" + vfc_emsdriver_docker: "${EMSDRIVER_DOCKER}" + vfc_catalog_docker: "${CATALOG_DOCKER}" + vfc_wfengine_mgrservice_docker: "${WFENGINE_MGRSERVICE_DOCKER}" + vfc_wfengine_activiti_docker: "${WFENGINE_ACTIVITI_DOCKER}" + vfc_multivimproxy_docker: "${MULTIVIMPROXY_DOCKER}" ##################### # # @@ -197,7 +198,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