From ae54354b42b5aa58017ca9232b8fa63ebef54833 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Tue, 27 Mar 2018 16:27:01 +0200 Subject: Add Nokia v2 docker image Change-Id: I1c8b4fc70b3124dcc910c8a1cef063d0090d09b5 Issue-ID: VFC-728 Signed-off-by: Denes Nemeth --- heat/ONAP/onap_openstack.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'heat/ONAP/onap_openstack.yaml') diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index f975a2a9..2bc32a15 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -340,6 +340,8 @@ parameters: vfc_nokia_docker: type: string + vfc_nokiav2_docker: + type: string vfc_ztevnfmdriver_docker: type: string vfc_ztesdncdriver_docker: @@ -369,6 +371,13 @@ parameters: vfc_wfengine_activiti_docker: type: string + cbam_username: + type: string + cbam_password: + type: string + cbam_ip: + type: string + aai_branch: type: string appc_branch: @@ -1557,6 +1566,10 @@ resources: __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } __vfc_nokia_docker__: { get_param: vfc_nokia_docker } + __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker } + __cbam_ip__: { get_param: cbam_ip } + __cbam_username__: { get_param: cbam_username } + __cbam_password__: { get_param: cbam_password } __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker } __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker } __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker } @@ -1591,8 +1604,12 @@ resources: echo "__uui_docker__" > /opt/config/uui_docker.txt echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + echo "__cbam_ip__" > /opt/config/cbam_ip.txt + echo "__cbam_username__" > /opt/config/cbam_username.txt + echo "__cbam_password__" > /opt/config/cbam_password.txt echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt + echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt @@ -1988,4 +2005,4 @@ resources: curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh cd /opt chmod +x aaf_install.sh - ./aaf_install.sh \ No newline at end of file + ./aaf_install.sh -- cgit 1.2.3-korg