diff options
| -rwxr-xr-x | boot/vfc_vm_init.sh | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 11 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 19 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 19 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 11 |
5 files changed, 66 insertions, 2 deletions
diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index 269fa075..f7387b73 100755 --- a/boot/vfc_vm_init.sh +++ b/boot/vfc_vm_init.sh @@ -25,6 +25,7 @@ docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER +docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER docker rm -f vfc_wfengine_mgrservice docker rm -f vfc_wfengine_activiti @@ -41,6 +42,7 @@ docker rm -f vfc_vnfres docker rm -f vfc_ztesdncdriver docker rm -f vfc_ztevnfmdriver docker rm -f vfc_svnfm_nokia +docker rm -f vfc_svnfm_nokiav2 # Insert docker run instructions here docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER @@ -58,3 +60,9 @@ docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEX docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER + +CBAM_IP=$(cat /opt/config/cbam_ip.txt) +VNFM_ID=vnfmUuid +CBAM_PASSWORD=$(cat /opt/config/cbam_password.txt) +CBAM_USERNAME=$(cat /opt/config/cbam_username.txt) +docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "CBAM_CATALOG_URL=https://$CBAM_IP:443/api/catalog/adapter/" -e "CBAM_LCN_URL=https://$CBAM_IP:443/vnfm/lcn/v3/" -e "CBAM_KEYCLOAK_URL=https://$CBAM_IP:443/auth/" -e "CBAM_USERNAME=$CBAM_USERNAME" -e "CBAM_PASSWORD=$CBAM_PASSWORD" -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index adc3e40b..2cf70ac0 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -154,6 +154,7 @@ parameters: aaf_docker: latest vfc_nokia_docker: v1.0.2 + vfc_nokiav2_docker: 1.1.0-STAGING-latest vfc_ztevnfmdriver_docker: v1.0.2 vfc_ztesdncdriver_docker: v1.0.0 vfc_vnfres_docker: v1.0.1 @@ -169,6 +170,16 @@ parameters: vfc_wfengine_mgrservice_docker: v1.0.0 vfc_wfengine_activiti_docker: v1.0.0 + ############################################ + # # + # 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.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 diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 0b83ac88..a258d90c 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.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: @@ -1556,6 +1565,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 } @@ -1590,8 +1603,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 @@ -1987,4 +2004,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 diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 3229c1a5..1e5a06ed 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -154,6 +154,7 @@ parameters: aaf_docker: ${AAF_DOCKER} vfc_nokia_docker: ${NOKIA_DOCKER} + vfc_nokiav2_docker: ${NOKIAV2_DOCKER} vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER} vfc_ztesdncdriver_docker: ${ZTESDNCDRIVER_DOCKER} vfc_vnfres_docker: ${VNFRES_DOCKER} @@ -169,6 +170,16 @@ parameters: vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER} vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_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 # |