Configuration fixes for integration heat env

[so/docker-config.git] / volumes / so / config / asdc-controller / onapheat / override.yaml

diff --git a/volumes/so/config/asdc-controller/onapheat/override.yaml b/volumes/so/config/asdc-controller/onapheat/override.yaml
index 888ac1d..6afc196 100644 (file)
--- a/volumes/so/config/asdc-controller/onapheat/override.yaml
+++ b/volumes/so/config/asdc-controller/onapheat/override.yaml
@@ -2,17 +2,40 @@ server:
   port: 8085
 
 spring:
+  datasource:
+    url: jdbc:mariadb://mariadb:3306/catalogdb
+    username: cataloguser
+    password: catalog123
+    driver-class-name: org.mariadb.jdbc.Driver
+    dbcp2:
+      initial-size: 5
+      max-total: 20
+      validation-query: select 1
+      test-on-borrow: true
+
   security:
     usercredentials:
-    -  
+    -
       username: asdc
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
       role: Asdc-Client
-    -  
+    -
       username: mso_admin
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
       role: ACTUATOR
 
+request:
+  datasource:
+    url: jdbc:mariadb://mariadb:3306/requestdb
+    username: requestuser
+    password: request123
+    driver-class-name: org.mariadb.jdbc.Driver
+    dbcp2:
+      initial-size: 5
+      max-total: 20
+      validation-query: select 1
+      test-on-borrow: true
+
 mso:
   logPath: ./logs/asdc
   catalog:
@@ -22,7 +45,7 @@ mso:
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
   site-name: onapheat
-  aai:  
+  aai:
     endpoint: https://aai.api.simpledemo.onap.org:8443
   asdc-connections:
     asdc-controller1:
@@ -36,7 +59,7 @@ mso:
       pollingTimeout: 60
       relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
       activateServerTLSAuth: false
-      keyStorePassword:  
+      keyStorePassword:
       keyStorePath:
       watchDogTimeout: 60
       isFitlerInEmptyResources: true