11 files changed, 90 insertions, 34 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:
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 269bb097..83ae97b4 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -29,6 +29,3 @@ parameters:
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: openstack
   sec_group: PUT THE ONAP SECURITY GROUP HERE
-  sdnc_model_name: vFW_spinup
-  sdnc_model_version: 1.0.0
-  sdnc_artifact_name: vFW_vNF_Artifact
diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index 8df04956..00e03ce4 100644
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -250,7 +250,7 @@ resources:
         - port: { get_resource: vfw_private_0_port }
         - port: { get_resource: vfw_private_1_port }
         - port: { get_resource: vfw_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -324,7 +324,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vpg_private_0_port }
         - port: { get_resource: vpg_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -396,7 +396,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vsn_private_0_port }
         - port: { get_resource: vsn_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
diff --git a/heat/vFW_HPA/vFW/base_vfw.env b/heat/vFW_HPA/vFW/base_vfw.env
index cc53e413..01fd24a0 100644
--- a/heat/vFW_HPA/vFW/base_vfw.env
+++ b/heat/vFW_HPA/vFW/base_vfw.env
@@ -38,6 +38,3 @@ parameters:
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: openstack
   sec_group: PUT THE ONAP SECURITY GROUP HERE
-  sdnc_model_name: vFW_spinup
-  sdnc_model_version: 1.0.0
-  sdnc_artifact_name: vFW_vNF_Artifact
diff --git a/heat/vFW_HPA/vFW/base_vfw.yaml b/heat/vFW_HPA/vFW/base_vfw.yaml
index df3765ef..4b6d6488 100644
--- a/heat/vFW_HPA/vFW/base_vfw.yaml
+++ b/heat/vFW_HPA/vFW/base_vfw.yaml
@@ -112,24 +112,31 @@ parameters:
   vfw_private_0_port_vnic_type:
     type: string
     description: vfw port 0 vnic type (normal, direct)
+    default: normal
   vfw_private_1_port_vnic_type:
     type: string
     description: vfw port 1 vnic type (normal, direct)
+    default: normal
   vfw_private_2_port_vnic_type:
     type: string
     description: vfw port 2 vnic type (normal, direct)
+    default: normal
   vsn_private_0_port_vnic_type:
     type: string
     description: vsn port 0 vnic type (normal, direct)
+    default: normal
   vsn_private_1_port_vnic_type:
     type: string
     description: vsn port 1 vnic type (normal, direct)
+    default: normal
   vpg_private_0_port_vnic_type:
     type: string
     description: vpg port 0 vnic type (normal, direct)
+    default: normal
   vpg_private_1_port_vnic_type:
     type: string
     description: vpg port 1 vnic type (normal, direct)
+    default: normal
   vfw_name_0:
     type: string
     label: vFirewall name
@@ -282,7 +289,7 @@ resources:
         - port: { get_resource: vfw_private_0_port }
         - port: { get_resource: vfw_private_1_port }
         - port: { get_resource: vfw_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -358,7 +365,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vpg_private_0_port }
         - port: { get_resource: vpg_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -432,7 +439,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vsn_private_0_port }
         - port: { get_resource: vsn_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
diff --git a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
index 13045840..c46d8996 100644
--- a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
@@ -112,18 +112,23 @@ parameters:
   vfw_private_0_port_vnic_type:
     type: string
     description: vfw port 0 vnic type (normal, direct)
+    default: normal
   vfw_private_1_port_vnic_type:
     type: string
     description: vfw port 1 vnic type (normal, direct)
+    default: normal
   vfw_private_2_port_vnic_type:
     type: string
     description: vfw port 2 vnic type (normal, direct)
+    default: normal
   vsn_private_0_port_vnic_type:
     type: string
     description: vsn port 0 vnic type (normal, direct)
+    default: normal
   vsn_private_1_port_vnic_type:
     type: string
     description: vsn port 1 vnic type (normal, direct) 
+    default: normal
   vfw_name_0:
     type: string
     label: vFirewall name
diff --git a/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
index 20d76a28..8ce1225b 100644
--- a/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
@@ -92,9 +92,11 @@ parameters:
   vpg_private_0_port_vnic_type:
     type: string
     description: vpg port 0 vnic type (normal, direct)
+    default: normal
   vpg_private_1_port_vnic_type:
     type: string
     description: vpg port 1 vnic type (normal, direct)
+    default: normal
   vpg_name_0:
     type: string
     label: vPacketGenerator name