updated base yamls to properly connect to DB

Fix startup of catalog, request, bpmn and openstack

Change-Id: I83dcd17d03c71301610ab2c8bbeb30142cc14303
Issue-ID: SO-1558
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

2 files changed, 51 insertions, 56 deletions

diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
index b2b16274aa..5d3a837180 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
@@ -1,51 +1,51 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8090
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  adapters:
-    requestDb:
-      auth: Basic YnBlbDptc28tZGItMTUwNyE=
-      endpoint: http://localhost:8081
-  logPath: logs
-  site-name: localSite
-  infra-requests:
-    archived:
-      period: 180
-spring:
-  datasource:
-    jdbc-url: jdbc:mariadb://localhost:3306/requestdb
-    username: catalog
-    password: catalog123
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialize: true
-    initialization-mode: never
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'
-      role: BPEL-Client
-    -  
-      username: mso_admin
-      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
-      role: ACTUATOR
-
-
-flyway:
-  baseline-on-migrate: false
-  url: jdbc:mariadb://localhost:3306/requestdb
-  user: catalog
-  password: catalog123
+# will be used as entry in DB to say SITE OFF/ON for healthcheck

+

+server:

+    port: 8090

+    tomcat:

+        max-threads: 50

+ssl-enable: false

+mso:

+  adapters:

+    requestDb:

+      auth: Basic YnBlbDptc28tZGItMTUwNyE=

+      endpoint: http://localhost:8081

+  logPath: logs

+  site-name: localSite

+  infra-requests:

+    archived:

+      period: 180

+spring:

+  datasource:

+    url: jdbc:mariadb://localhost:3306/requestdb

+    username: catalog

+    password: catalog123

+    driver-class-name: org.mariadb.jdbc.Driver

+    initialize: true

+    initialization-mode: never

+  jpa:

+    generate-ddl: false

+    show-sql: false

+    hibernate:

+      ddl-auto: validate

+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy

+      enable-lazy-load-no-trans: true

+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect

+  security:

+    usercredentials:

+    -

+      username: bpel

+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'

+      role: BPEL-Client

+    -  

+      username: mso_admin

+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'

+      role: ACTUATOR

+

+

+flyway:

+  baseline-on-migrate: false

+  url: jdbc:mariadb://localhost:3306/requestdb

+  user: catalog

+  password: catalog123

       
\ No newline at end of file
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
index 0da782bf00..9429592670 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -18,15 +18,10 @@ mso:
 # H2
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2: 
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: true 
   jpa:
       show-sql: false
       hibernate: