You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/06/15 16:20:24 UTC
[5/7] airavata git commit: AIRAVATA-2376 Switch to MariaDB for
Profile Service
AIRAVATA-2376 Switch to MariaDB for Profile Service
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2b7a9a34
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2b7a9a34
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2b7a9a34
Branch: refs/heads/develop
Commit: 2b7a9a344e9c29173a532e6e8cfb9afcb65d27ef
Parents: 93fa1f7
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Jun 14 11:48:27 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jun 15 12:19:55 2017 -0400
----------------------------------------------------------------------
.../roles/api-orch/templates/airavata-server.properties.j2 | 6 +++---
.../server/src/main/resources/airavata-server.properties | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2b7a9a34/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index 63d79d1..d09d814 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -316,11 +316,11 @@ enable.kafka.logging=false
profile.service.server.host={{ profile_service_host }}
profile.service.server.port={{ profile_service_port }}
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-# mysql properties
-profile.service.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ profile_service }}
+# MariaDB properties
+profile.service.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ profile_service }}
profile.service.jdbc.user={{ db_user }}
profile.service.jdbc.password={{ db_password }}
-profile.service.jdbc.driver=com.mysql.jdbc.Driver
+profile.service.jdbc.driver=org.mariadb.jdbc.Driver
profile.service.validationQuery=SELECT 1
###########################################################################
http://git-wip-us.apache.org/repos/asf/airavata/blob/2b7a9a34/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 78d5bed..15fcfe2 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -336,9 +336,9 @@ profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
# derby properties
profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata
profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-# mysql properties
-#profile.service.jdbc.url=jdbc:mysql://localhost:3306/profile_service
-#profile.service.jdbc.driver=com.mysql.jdbc.Driver
+# MariaDB properties
+#profile.service.jdbc.url=jdbc:mariadb://localhost:3306/profile_service
+#profile.service.jdbc.driver=org.mariadb.jdbc.Driver
profile.service.jdbc.user=airavata
profile.service.jdbc.password=airavata
# add validationquery only if db has been initialized during server startup,