opendev/puppet-zanata
Code Issues Proposed changes

Set the mysql driver name based on ubuntu package

Browse Source 
The different versions of ubuntu packaging use different driver names
for the mysql jdbc connector. Ensure we use the correct one on trusty
and on xenial.

Change-Id: I2cb154925bd67decd21fd440c13d3aafc4d8d982
This commit is contained in:
Clark Boylan 2016-12-02 15:24:14 -08:00
parent 51062019a4
commit 4e86b746c3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -104,6 +104,15 @@ class zanata(
require => Package['unzip'],
}
# The mysql driver name differs based on the version of the package. Ensure
# we set it correctly when writing the standalone.xml config file below.
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
$mysql_driver_name = 'mysql-connector-java.jar_com.mysql.jdbc.Driver_5_1'
}
else {
$mysql_driver_name = 'mysql-connector-java.jar'
}
file { '/opt/wildfly/standalone/deployments/mysql-connector-java.jar':
ensure => 'link',
target => '/usr/share/java/mysql-connector-java.jar',

2
templates/standalone.xml.erb
View File

@ -155,7 +155,7 @@
<datasource jndi-name="java:jboss/datasources/zanataDatasource" pool-name="zanataDatasource" enabled="true" use-ccm="false">
<connection-url>jdbc:mysql://<%= @mysql_host %>:<%= @mysql_port %>/zanata?characterEncoding=UTF-8</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java.jar</driver>
<driver><%= @mysql_driver_name %></driver>
<pool>
<min-pool-size>0</min-pool-size>
<max-pool-size>20</max-pool-size>