From: sarada prasad sahoo Date: Thu, 22 Aug 2019 09:18:43 +0000 (+0530) Subject: SO datasource config update X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1f1a17e1ce985496da0a10fbccfc08b1919f74e4;p=so%2Fdocker-config.git SO datasource config update SO datasource config update as per new Hikari library changes in SO Change-Id: Ifec4936ca269395bf14609b2cee8f944005931b3 Issue-ID: SO-2118 Signed-off-by: sarada prasad sahoo --- diff --git a/volumes/so/config/api-handler-infra/onapheat/override.yaml b/volumes/so/config/api-handler-infra/onapheat/override.yaml index 6c0b4a8..5e03570 100644 --- a/volumes/so/config/api-handler-infra/onapheat/override.yaml +++ b/volumes/so/config/api-handler-infra/onapheat/override.yaml @@ -15,7 +15,7 @@ mso: catalog: db: spring: - endpoint: "http://catalog-db-adapter:8082" + endpoint: http://catalog-db-adapter:8082 db: auth: Basic YnBlbDpwYXNzd29yZDEk config: @@ -31,7 +31,7 @@ mso: default: testApi: GR_API camundaURL: http://bpmn-infra:8081 - camundaAuth: 18FAA5A7D9AF6D99D23191C0408BFC140CE7B3B2BE5D3E3C7078C2383F27752356E5ADFFA388EFBC3B5C3D0F8A8926 + camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A async: core-pool-size: 50 max-pool-size: 50 @@ -64,15 +64,13 @@ mso: 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 + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: catdb-pool + registerMbeans: true jpa: show-sql: true hibernate: @@ -112,13 +110,17 @@ spring: 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 - + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: reqdb-pool + registerMbeans: true +org: + onap: + so: + cloud-owner: CloudOwner + adapters: + network: + encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7 diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml index a1e178c..b7e1114 100644 --- a/volumes/so/config/bpmn-infra/onapheat/override.yaml +++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml @@ -287,15 +287,13 @@ server: max-threads: 50 spring: datasource: - driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://mariadb:3306/camundabpmn - username: camundauser - password: camunda123 - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true + hikari: + driver-class-name: org.mariadb.jdbc.Driver + jdbcUrl: jdbc:mariadb://mariadb:3306/camundabpmn + username: camundauser + password: camunda123 + pool-name: bpmn-pool + registerMbeans: true security: usercredentials: - diff --git a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml index fcb7952..3733fb8 100644 --- a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml +++ b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml @@ -14,17 +14,13 @@ mso: auth: Basic YnBlbDpwYXNzd29yZDEk spring: datasource: - url: jdbc:mariadb://mariadb:3306/catalogdb - username: cataloguser - password: catalog123 - driver-class-name: org.mariadb.jdbc.Driver - initialize: false - initialization-mode: never - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: catdb-pool + registerMbeans: true jpa: generate-ddl: false show-sql: false diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml index 8e2ca2b..2f61e90 100644 --- a/volumes/so/config/openstack-adapter/onapheat/override.yaml +++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml @@ -3,15 +3,13 @@ server: 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 + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: catdb-pool + registerMbeans: false security: usercredentials: diff --git a/volumes/so/config/request-db-adapter/onapheat/override.yaml b/volumes/so/config/request-db-adapter/onapheat/override.yaml index 5eaabc2..1bceafa 100644 --- a/volumes/so/config/request-db-adapter/onapheat/override.yaml +++ b/volumes/so/config/request-db-adapter/onapheat/override.yaml @@ -14,17 +14,13 @@ mso: auth: Basic YnBlbDpwYXNzd29yZDEk spring: datasource: - url: jdbc:mariadb://mariadb:3306/requestdb - username: requestuser - password: request123 - driver-class-name: org.mariadb.jdbc.Driver - initialize: false - initialization-mode: never - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: reqdb-pool + registerMbeans: true jpa: generate-ddl: false show-sql: false diff --git a/volumes/so/config/sdc-controller/onapheat/override.yaml b/volumes/so/config/sdc-controller/onapheat/override.yaml index 43dc3b6..01e9449 100644 --- a/volumes/so/config/sdc-controller/onapheat/override.yaml +++ b/volumes/so/config/sdc-controller/onapheat/override.yaml @@ -5,15 +5,13 @@ server: 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 + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: catdb-pool + registerMbeans: false security: usercredentials: @@ -28,15 +26,13 @@ spring: request: datasource: - jdbc-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 + hikari: + jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + pool-name: reqdb-pool + registerMbeans: false mso: msoKey: 07a7159d3bf51a0e53be7a8f89699be7 diff --git a/volumes/so/config/vfc-adapter/onapheat/override.yaml b/volumes/so/config/vfc-adapter/onapheat/override.yaml index af88565..f9b6eea 100644 --- a/volumes/so/config/vfc-adapter/onapheat/override.yaml +++ b/volumes/so/config/vfc-adapter/onapheat/override.yaml @@ -3,15 +3,13 @@ logging: spring: datasource: - driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://mariadb:3306/requestdb - username: requestuser - password: request123 - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true + hikari: + driver-class-name: org.mariadb.jdbc.Driver + jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + pool-name: reqdb-pool + registerMbeans: true server: port: 8084