summaryrefslogtreecommitdiffstats
path: root/heat/ONAP
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-05-04 13:23:13 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-04 13:23:13 +0000
commit3d94013ab5f93ec2d47afb5c1faab53bdbf3064e (patch)
tree522ef0bed563e2d19f2a58d4c7545f7d3e4950bc /heat/ONAP
parentf35a4829e267188df8064562d43de65351e6a7e9 (diff)
parent405dfedeb11aa1c313ed696c01279c178575d30a (diff)
Merge "Sync up env template with env file changes"
Diffstat (limited to 'heat/ONAP')
-rw-r--r--heat/ONAP/onap_openstack.env16
-rw-r--r--heat/ONAP/onap_openstack_template.env10
2 files changed, 20 insertions, 6 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index e8866af1..0aea45c5 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -143,7 +143,7 @@ parameters:
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
- policy_docker: v1.2.0
+ policy_docker: 1.2.0
portal_docker: 2.1-STAGING-latest
robot_docker: 1.2-STAGING-latest
sdc_docker: 1.2-STAGING-latest
@@ -151,12 +151,12 @@ parameters:
vid_docker: 1.2.1
clamp_docker: 2.0-STAGING-latest
msb_docker: 1.1.0-STAGING-latest
- mvim_docker: 1.1.2-SNAPSHOT
+ mvim_docker: 1.1.2-STAGING
mvim_openstack_docker: 1.1.2-SNAPSHOT
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
+ dgbuilder_docker: 0.2-STAGING-latest
cli_docker: 2.0-STAGING-latest
music_docker: latest
oof_docker: latest
@@ -202,6 +202,16 @@ parameters:
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
+
#####################
# #
# ONAP repositories #
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 6b11df00..9f32e394 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}
@@ -216,7 +219,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 +232,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