aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-12-10 13:49:26 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-10 13:49:26 +0000
commitcf89422a8fade9ce5866b25da74d5d8a0dff539f (patch)
tree53b0712991bc8652f3355c8c7d84c5a81a396c8d
parent3b56cf0c1763c45b7673a087107c5e1553dd4f40 (diff)
parent02070415728a54121c296e33c4ef5e0641076df1 (diff)
Merge "Fix App Yamls"
-rw-r--r--adapters/mso-catalog-db-adapter/src/main/resources/application.yaml3
-rw-r--r--adapters/mso-openstack-adapters/src/main/resources/application.yaml3
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/application.yaml2
3 files changed, 3 insertions, 5 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
index ff6f2378fa..749a319372 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -14,7 +14,6 @@ mso:
max-pool-size: 50
queue-capacity: 500
-# CatalogDB
spring:
datasource:
jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
@@ -34,7 +33,7 @@ spring:
fail-on-empty-beans: false
flyway:
baseline-on-migrate: false
- jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+ url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
user: ${DB_ADMIN_USERNAME}
password: ${DB_ADMIN_PASSWORD}
outOfOrder: true
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application.yaml b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
index 88099be07f..bc3bfba418 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
@@ -13,8 +13,7 @@ mso:
core-pool-size: 50
max-pool-size: 50
queue-capacity: 500
-
-# CatalogDB
+
spring:
datasource:
jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
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 4d200d25b8..af99a86e8e 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -46,7 +46,7 @@ spring:
role: ACTUATOR
flyway:
baseline-on-migrate: false
- jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+ url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
user: ${DB_ADMIN_USERNAME}
password: ${DB_ADMIN_PASSWORD}