From 745f3fb5b99576d2baf37128d51682ae4a0d94a2 Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Tue, 6 Feb 2018 17:10:23 +0100 Subject: [PATCH] Use Drizzle JDBC for monasca-thresh in devstack MySQL Connector is released under GPLv2 license which restricts the distribution of the consuming project [1]. This change configures monasca-thresh to use Drizzle JDBC (BSD license) in devstack. [1] https://governance.openstack.org/tc/reference/licensing.html Story: 2001522 Task: 6323 Change-Id: I1154e166e1aa6fe6693bdd169d2e5544719fbe6c --- devstack/files/monasca-thresh/thresh-config.yml | 2 +- devstack/plugin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/files/monasca-thresh/thresh-config.yml b/devstack/files/monasca-thresh/thresh-config.yml index 89041fa50..d93c60f6f 100644 --- a/devstack/files/monasca-thresh/thresh-config.yml +++ b/devstack/files/monasca-thresh/thresh-config.yml @@ -109,7 +109,7 @@ sporadicMetricNamespaces: database: driverClass: %MONASCA_THRESH_DATABASE_ENGINE% - url: "jdbc:mysql://%DATABASE_HOST%:%DATABASE_PORT%/mon?useSSL=true" + url: "jdbc:drizzle://%DATABASE_HOST%:%DATABASE_PORT%/mon" user: "%DATABASE_USER%" password: "%DATABASE_PASSWORD%" properties: diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 02adac3dd..96a535acc 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -968,7 +968,7 @@ function install_monasca_thresh { sudo chmod 0640 /etc/monasca/thresh-config.yml - local dbEngine="com.mysql.jdbc.jdbc2.optional.MysqlDataSource" + local dbEngine="org.drizzle.jdbc.DrizzleDriver" local dbPort=3306 if [[ ${MONASCA_DATABASE_USE_ORM} == "True" ]]; then