Merge "Allow flexible specification of JDBC driver"

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
index 150d208..097d4fd 100644 (file)
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
@@ -20,7 +20,7 @@
 #
 
 # DB parameters
-operation.history.url=jdbc:mariadb://${envd:SQL_HOST}:${envd:SQL_PORT:3306}/operationshistory
+operation.history.url=${envd:JDBC_URL}operationshistory${envd:JDBC_OPTS}
 operation.history.userName=${envd:SQL_USER}
 operation.history.password=${envd:SQL_PASSWORD}