X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=b731a34e81edd705c0b970f644e6df32f7cc8c8d;hb=f20f6a2f98ea2e794f309b90a0a6359802bf9faf;hp=6b11df00d9cb6491aed808de0716e6dac4c72d56;hpb=3850b6863771f6caf15764f67733bdf1df0811ab;p=demo.git

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 6b11df00..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
 
   ###########################
@@ -135,6 +136,7 @@ parameters:
   music_branch: master
   nbi_branch: master
   aaf_branch: master
+  sms_branch: master
   oof_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
@@ -157,8 +159,9 @@ parameters:
   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}
 
@@ -199,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 #
@@ -216,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/dmaap/messagerouter/messageservice.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
@@ -229,4 +222,5 @@ parameters:
   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