diff options
| -rw-r--r-- | heat/ONAP/cloud-config/.env | 17 | ||||
| -rw-r--r-- | heat/ONAP/cloud-config/docker-compose.yml | 41 | ||||
| -rw-r--r-- | heat/ONAP/cloud-config/sdc_install.sh | 13 | ||||
| -rw-r--r-- | heat/ONAP/cloud-config/sdc_wfd_vm_init.sh | 18 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 3 |
5 files changed, 70 insertions, 22 deletions
diff --git a/heat/ONAP/cloud-config/.env b/heat/ONAP/cloud-config/.env new file mode 100644 index 00000000..cbf25f8d --- /dev/null +++ b/heat/ONAP/cloud-config/.env @@ -0,0 +1,17 @@ +TAG=latest +REGISTRY=nexus3.onap.org:10001/ +CS_HOST=yyy +CS_AUTHENTICATE=true +CS_USER=asdc_user +CS_PASSWORD=Aa1234%^! +WF_BE_INIT_CS_PORT=9160 +WF_BE_JAVA_OPTIONS=-Xdebug -agentlib:jdwp=transport=dt_socket,address=7001,server=y,suspend=n -Xmx1536m -Xms1536m +WF_BE_CS_PORT=9042 +WF_BE_DEBUG_PORT=7001 +SDC_PROTOCOL=HTTP +SDC_HOST=yyy +SDC_USER=workflow +SDC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +WF_FE_JAVA_OPTIONS=-Xdebug -agentlib:jdwp=transport=dt_socket,address=7000,server=y,suspend=n -Xmx1536m -Xms1536m +WF_FE_HOST_PORT=8184 +WF_FE_DEBUG_PORT=7000
\ No newline at end of file diff --git a/heat/ONAP/cloud-config/docker-compose.yml b/heat/ONAP/cloud-config/docker-compose.yml new file mode 100644 index 00000000..4aedf61a --- /dev/null +++ b/heat/ONAP/cloud-config/docker-compose.yml @@ -0,0 +1,41 @@ +version: '3' +services: + + workflow-cassandra-init: + image: "${REGISTRY}onap/workflow-init:${TAG}" + environment: + - CS_HOST=${CS_HOST} + - CS_AUTHENTICATE + - CS_USER + - CS_PASSWORD + - CS_PORT=${WF_BE_INIT_CS_PORT} + + workflow-backend: + depends_on: + - workflow-cassandra-init + image: "${REGISTRY}onap/workflow-backend:${TAG}" + ports: + - "5603:5603" + - "${WF_BE_DEBUG_PORT}:${WF_BE_DEBUG_PORT}" + environment: + - JAVA_OPTIONS=${WF_BE_JAVA_OPTIONS} + - CS_HOSTS=${CS_HOST} + - CS_USER + - CS_PASSWORD + - CS_PORT=${WF_BE_CS_PORT} + - SDC_PROTOCOL + - SDC_ENDPOINT="${SDC_HOST}:8080" + - SDC_USER + - SDC_PASSWORD + + workflow-frontend: + depends_on: + - workflow-cassandra-init + - workflow-backend + image: "${REGISTRY}onap/workflow-frontend:${TAG}" + ports: + - "${WF_FE_HOST_PORT}:8080" + - "${WF_FE_DEBUG_PORT}:${WF_FE_DEBUG_PORT}" + environment: + - JAVA_OPTIONS=${WF_FE_JAVA_OPTIONS} + - BACKEND=http://workflow-backend:8080 diff --git a/heat/ONAP/cloud-config/sdc_install.sh b/heat/ONAP/cloud-config/sdc_install.sh index caeff2f4..bf6b5929 100644 --- a/heat/ONAP/cloud-config/sdc_install.sh +++ b/heat/ONAP/cloud-config/sdc_install.sh @@ -52,4 +52,15 @@ EOF # 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 + +#Install docker-compose for workflow installation +mkdir /opt/docker +curl -L https://github.com/docker/compose/releases/download/1.23.1/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose +chmod +x /opt/docker/docker-compose + +#Prepare env for docker compose +IP_ADDRESS=$(cat /opt/config/private_ip.txt) +sed -i "s/yyy/$IP_ADDRESS/g" .env + +#Setup sdc workflow using docker compose +docker-compose up -d
\ No newline at end of file diff --git a/heat/ONAP/cloud-config/sdc_wfd_vm_init.sh b/heat/ONAP/cloud-config/sdc_wfd_vm_init.sh deleted file mode 100644 index bcbcb4ac..00000000 --- a/heat/ONAP/cloud-config/sdc_wfd_vm_init.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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.yaml b/heat/ONAP/onap_openstack.yaml index decb41c6..3cc01e76 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1494,9 +1494,6 @@ resources: - path: /opt/sdc_vm_init.sh permissions: '0755' content: { get_file: cloud-config/sdc_vm_init.sh } - - path: /opt/sdc_wfd_vm_init.sh - permissions: '0755' - content: { get_file: cloud-config/sdc_wfd_vm_init.sh } - path: /etc/init.d/serv.sh permissions: '0755' content: |