stackforge/puppet-openstack-cloud
Code Issues Proposed changes

fixes for mariadb-galera-server on RHEL

Browse Source
This commit is contained in:
Gonéri Le Bouder 2014-01-05 14:59:43 +01:00
parent 67243164ef
commit be45b25a17
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/database/sql.pp
View File

@ -52,6 +52,7 @@ class privatecloud::database::sql (
include 'xinetd' include 'xinetd'
# TODO(Gonéri): OS/values detection should be moved in a params.pp
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
class { 'mysql': class { 'mysql':
@ -59,6 +60,17 @@ class privatecloud::database::sql (
client_package_name => 'MariaDB-client', client_package_name => 'MariaDB-client',
service_name => 'mysql' service_name => 'mysql'
} }
# galera-23.2.7-1.rhel6.x86_64
$wsrep_provider = "/usr/lib64/galera/libgalera_smm.so"
# TODO(Gonéri)
# MariaDB-Galera-server-5.5.34-1.x86_64 doesn't create this
# directory
file { '/var/log/mysql':
ensure => directory
mode => 0750
}
} }
'Debian': { 'Debian': {
class { 'mysql': class { 'mysql':
@ -66,6 +78,7 @@ class privatecloud::database::sql (
client_package_name => 'mariadb-client', client_package_name => 'mariadb-client',
service_name => 'mysql' service_name => 'mysql'
} }
$wsrep_provider = "/usr/lib/galera/libgalera_smm.so"
} }
default: { default: {
err "${::osfamily} not supported yet" err "${::osfamily} not supported yet"
@ -189,10 +202,11 @@ basedir = /usr
} }
# TODO/WARNING(Gonéri): template changes do not trigger configuration changes
mysql::server::config{'basic_config': mysql::server::config{'basic_config':
notify_service => false, notify_service => false,
notify => Exec['clean-mysql-binlog'], notify => Exec['clean-mysql-binlog'],
settings => template('privatecloud/database/mysql.conf.erb'), settings => template('privatecloud/database/mysql.conf.erb')
} }
exec{'clean-mysql-binlog': exec{'clean-mysql-binlog':

2
templates/database/mysql.conf.erb
View File

@ -40,7 +40,7 @@ innodb_max_dirty_pages_pct = 50
binlog_format = ROW binlog_format = ROW
innodb_autoinc_lock_mode = 2 innodb_autoinc_lock_mode = 2
innodb_locks_unsafe_for_binlog = 1 innodb_locks_unsafe_for_binlog = 1
wsrep_provider = /usr/lib/galera/libgalera_smm.so wsrep_provider = "<%= @wsrep_provider %>"
wsrep_cluster_name = "galera_cluster" wsrep_cluster_name = "galera_cluster"
<% if @hostname != @galera_master -%> <% if @hostname != @galera_master -%>
# This node is not Galera Master (connect wsrep to galera_master) # This node is not Galera Master (connect wsrep to galera_master)