From ea84b36447601d0d6a633ae708b72c6aaae6dc67 Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Tue, 3 Dec 2019 16:15:20 -0500
Subject: Refractor controller blueprint modules

Move controller blueprints modules to blueprints processor and change the maven group name.

Fix test cba and model type paths

Fix dependencies issues.

Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b
---
 .../application/src/main/dc/docker-compose.yaml                | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml')

diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
index ada461b52..0ff04bf3a 100755
--- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
+++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
@@ -5,9 +5,9 @@ services:
     image: mariadb:latest
     container_name: ccsdk-mariadb
     ports:
-    - "3306:3306"
+      - "3306:3306"
     volumes:
-    - ~/vm_mysql:/var/lib/mysql
+      - ~/vm_mysql:/var/lib/mysql
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: sdnctl
@@ -19,6 +19,7 @@ services:
       - db
     image: onap/ccsdk-blueprintsprocessor:latest
     container_name: cds-controller-default
+    hostname: cds-controller-default
     ports:
       - "8000:8080"
       - "9111:9111"
@@ -26,7 +27,7 @@ services:
     volumes:
       - blueprints-deploy:/opt/app/onap/blueprints/deploy
     environment:
-      APPLICATIONNAME: BlueprintsProcessor
+      APPLICATIONNAME: cds-controller
       BUNDLEVERSION: 1.0.0
       APP_CONFIG_HOME: /opt/app/onap/config
       STICKYSELECTORKEY:
@@ -46,13 +47,14 @@ services:
       - db
     image: onap/ccsdk-py-executor
     container_name: py-executor-default
+    hostname: py-executor-default
     ports:
       - "50052:50052"
     restart: always
     volumes:
       - blueprints-deploy:/opt/app/onap/blueprints/deploy
     environment:
-      APPLICATIONNAME: PythonExecutor
+      APPLICATIONNAME: py-executor
       BUNDLEVERSION: 1.0.0
       APP_CONFIG_HOME: /opt/app/onap/config
       STICKYSELECTORKEY:
-- 
cgit 1.2.3-korg