moved flyway under spring namespace

Fix startup of catalog, request, bpmn and openstack

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

3 files changed, 18 insertions, 20 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 d46a8ee49d..aa9317c920 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -21,6 +21,13 @@ spring:
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
     initialization-mode: never
+  flyway:
+    baseline-on-migrate: false
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+    user: ${DB_ADMIN_USERNAME}
+    password: ${DB_ADMIN_PASSWORD}
+    outOfOrder: true
+    validateOnMigrate: false
   jpa:
       show-sql: true
       hibernate:
@@ -31,13 +38,6 @@ spring:
   jackson:
     serialization:
       fail-on-empty-beans: false
-flyway:
-  baseline-on-migrate: false
-  url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
-  user: ${DB_ADMIN_USERNAME}
-  password: ${DB_ADMIN_PASSWORD}
-  outOfOrder: true
-  validateOnMigrate: false
 
 #Actuator
 management:
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 9429592670..5a0ef6df74 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -22,6 +22,11 @@ spring:
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
+  flyway:
+    baseline-on-migrate: false
+    url:  jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+    user: ${DB_ADMIN_USERNAME}
+    password: ${DB_ADMIN_PASSWORD}
   jpa:
       show-sql: false
       hibernate:
@@ -39,11 +44,6 @@ spring:
       username: mso_admin
       password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
       role: ACTUATOR
-flyway:
-  baseline-on-migrate: false
-  url:  jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
-  user: ${DB_ADMIN_USERNAME}
-  password: ${DB_ADMIN_PASSWORD}
 
 #Actuator
 management:
diff --git a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
index db9885285e..94a132664e 100644
--- a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
+++ b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
@@ -25,6 +25,11 @@ spring:
     driver-class-name: org.mariadb.jdbc.Driver

     initialize: true

     initialization-mode: never

+  flyway:

+    baseline-on-migrate: false

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

+    user: root

+    password: password

   jpa:   

     generate-ddl: false

     show-sql: false

@@ -60,11 +65,4 @@ management:
     export:

       prometheus:

         enabled: true # Whether exporting of metrics to Prometheus is enabled.

-        step: 1m # Step size (i.e. reporting frequency) to use.  

-

-

-flyway:

-  baseline-on-migrate: false

-  url: jdbc:mariadb://localhost:3307/requestdb

-  user: root

-  password: password

+        step: 1m # Step size (i.e. reporting frequency) to use.  
\ No newline at end of file