X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=d60a7304fcf3cd589cf5e22d0300c661b7fd7588;hb=refs%2Fchanges%2F03%2F44703%2F1;hp=2cfdaa083f4fc14f6e1dba74da87c17519aa0b0a;hpb=46c624b87e406433634932ee2ded906fb04fb473;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 2cfdaa08..d60a7304 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -89,6 +89,10 @@ parameters:
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_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
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
@@ -96,6 +100,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
@@ -127,41 +132,81 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
+  nbi_branch: master
+  aaf_branch: master
+  oof_branch: master
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
-  appc_docker: v1.2.0
-  so_docker: v1.1.1
-  dcae_docker: v1.1.1
-  policy_docker: v1.1.1
-  portal_docker: v1.3.0
-  robot_docker: 1.1-STAGING-latest
-  sdc_docker: v1.1.0
-  sdnc_docker: v1.2.1
+  appc_docker: 1.3.0-SNAPSHOT-latest
+  so_docker: 1.2.1
+  policy_docker: 1.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.0.0
+  msb_docker: 1.1.0-STAGING-latest
   mvim_docker: v1.0.0
-  uui_docker: v1.0.1
-  esr_docker: v1.0.0
-  dgbuilder_docker: v0.1.0
-  cli_docker: v1.1.0
-
-  vfc_nokia_docker: v1.0.2
-  vfc_ztevnfmdriver_docker: v1.0.2
-  vfc_ztesdncdriver_docker: v1.0.0
-  vfc_vnfres_docker: v1.0.1
-  vfc_vnfmgr_docker: v1.0.1
-  vfc_vnflcm_docker: v1.0.1
-  vfc_resmanagement_docker: v1.0.0
-  vfc_nslcm_docker: v1.0.2
-  vfc_huawei_docker: v1.0.2
-  vfc_jujudriver_docker: v1.0.0
-  vfc_gvnfmdriver_docker: v1.0.1
-  vfc_emsdriver_docker: v1.0.1
-  vfc_catalog_docker: v1.0.2
-  vfc_wfengine_mgrservice_docker: v1.0.0
-  vfc_wfengine_activiti_docker: v1.0.0
+  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: v1.0.0
+  holmes_em_docker: v1.0.0
+
+  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
+
+  ############################################
+  #                                          #
+  # 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
 
   #####################
   #                   #
@@ -180,3 +225,7 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   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
+  oof_repo: http://gerrit.onap.org/r/optf/has.git