diff options
| -rw-r--r-- | boot/sdc_install.sh | 3 | ||||
| -rw-r--r-- | boot/sdc_wfd_vm_init.sh | 18 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 1 |
6 files changed, 31 insertions, 0 deletions
diff --git a/boot/sdc_install.sh b/boot/sdc_install.sh index 2c32266c..556a9b0d 100644 --- a/boot/sdc_install.sh +++ b/boot/sdc_install.sh @@ -56,8 +56,10 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w # Download scripts from Nexus curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_vm_init.sh -o /opt/sdc_vm_init.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_serv.sh -o /opt/sdc_serv.sh +curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_wfd_vm_init.sh -o /opt/sdc_wfd_vm_init.sh chmod +x /opt/sdc_vm_init.sh chmod +x /opt/sdc_serv.sh +chmod +x /opt/sdc_wfd_vm_init.sh mv /opt/sdc_serv.sh /etc/init.d update-rc.d sdc_serv.sh defaults @@ -141,3 +143,4 @@ fi # Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted ./sdc_vm_init.sh +./sdc_wfd_vm_init.sh diff --git a/boot/sdc_wfd_vm_init.sh b/boot/sdc_wfd_vm_init.sh new file mode 100644 index 00000000..bcbcb4ac --- /dev/null +++ b/boot/sdc_wfd_vm_init.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) +NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) +NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +RELEASE=$(cat /opt/config/sdc_wfd_docker.txt) + +source /opt/config/onap_ips.txt + +# pull sdc-workflow-designer docker image +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO +docker pull $NEXUS_DOCKER_REPO/onap/sdc/sdc-workflow-designer:$RELEASE + +docker rm -f sdc-workflow-designer + + +# setup sdc-workflow-designer docker image +docker run --detach --name sdc-workflow-designer --ulimit memlock=-1:-1 --memory 1g --memory-swap=1g --ulimit nofile=4096:100000 --publish 9527:8080 $NEXUS_DOCKER_REPO/onap/sdc/sdc-workflow-designer:$RELEASE diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index d252044d..f5d52ad6 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -150,6 +150,7 @@ parameters: mvim_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: v1.1.0 music_docker: latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index b29218d5..5ee87b56 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -321,6 +321,8 @@ parameters: type: string sdc_docker: type: string + sdc_wfd_docker: + type: string sdnc_docker: type: string vid_docker: @@ -1201,6 +1203,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __private_ip__: { get_param: sdc_ip_addr } __docker_version__: { get_param: sdc_docker } + __sdc_wfd_docker__: { get_param: sdc_wfd_docker } __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } @@ -1220,6 +1223,7 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index b530cfa7..720b39d2 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -317,6 +317,8 @@ parameters: type: string sdc_docker: type: string + sdc_wfd_docker: + type: string sdnc_docker: type: string vid_docker: @@ -1192,6 +1194,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __private_ip__: { get_param: sdc_ip_addr } __docker_version__: { get_param: sdc_docker } + __sdc_wfd_docker__: { get_param: sdc_wfd_docker } __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } @@ -1211,6 +1214,7 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 5bbd9ab4..fbabf097 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -143,6 +143,7 @@ parameters: portal_docker: ${PORTAL_APP_DOCKER} robot_docker: ${TESTSUITE_DOCKER} sdc_docker: ${SDC_BACKEND_DOCKER} + sdc_wfd_docker: ${SDC_WFD_DOCKER} sdnc_docker: ${SDNC_IMAGE_DOCKER} vid_docker: ${VID_DOCKER} clamp_docker: ${CLAMP_DOCKER} |