X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=b731a34e81edd705c0b970f644e6df32f7cc8c8d;hb=3262be122071e0d330ff70ebb4581adc48f9b41f;hp=5bbd9ab4e8fcff833321c89a6e2e53a5966a372d;hpb=85c450840c6dd79833bd541507d98447d7b0010f;p=demo.git

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 5bbd9ab4..b731a34e 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -92,6 +92,7 @@ parameters:
   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,7 +101,7 @@ parameters:
   #                         #
   ###########################
 
-  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1 or R2MVP)
+  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
@@ -133,13 +134,16 @@ parameters:
   clamp_branch: master
   vnfsdk_branch: master
   music_branch: master
+  nbi_branch: master
+  aaf_branch: master
+  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}
-  dcae_docker: ${BOOTSTRAP_DOCKER}
-  policy_docker: ${POLICY_DB_DOCKER}
+  policy_docker: ${POLICY_PE_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: ${TESTSUITE_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
@@ -148,14 +152,37 @@ parameters:
   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}
-  oof_docker: ${OOF_DOCKER}
-  aaf_docker: ${AAF_DOCKER}
+  oof_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}
+  dcae_heartbeat_docker: ${HEARTBEAT_DOCKER}
+  dcae_prh_docker: ${PRH_APP_SERVER_DOCKER}
+  holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
+  holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}
 
   vfc_nokia_docker: ${NOKIA_DOCKER}
   vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
@@ -175,16 +202,6 @@ parameters:
   vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
   vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
 
-  ############################################
-  #                                          #
-  # Parameters used by Nokia v2 SVNFM driver #
-  #                                          #
-  ############################################
-
-  cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
-
   #####################
   #                   #
   # ONAP repositories #
@@ -192,7 +209,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
@@ -203,3 +220,7 @@ parameters:
   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