Merge pull request #398 from enovance/cleanup-redhat

WIP - Red Hat: Finish MySQL /Galera
This commit is contained in:
Emilien Macchi
2014-04-01 22:49:12 +02:00

View File

@@ -73,12 +73,12 @@ class cloud::database::sql (
client_package_name => 'MariaDB-client',
service_name => $mysql_service_name,
}
# galera-23.2.7-1.rhel6.x86_64
# Specific to Red Hat
$wsrep_provider = '/usr/lib64/galera/libgalera_smm.so'
# TODO(Gonéri)
# MariaDB-Galera-server-5.5.34-1.x86_64 doesn't create this
$dirs = [ '/var/run/mysqld', '/var/log/mysql' ]
file { $dirs:
ensure => directory,
mode => '0750',
@@ -93,6 +93,8 @@ class cloud::database::sql (
client_package_name => 'mariadb-client',
service_name => $mysql_service_name,
}
# Specific to Debian / Ubuntu
$wsrep_provider = '/usr/lib/galera/libgalera_smm.so'
database_user { 'debian-sys-maint@localhost':
@@ -101,6 +103,7 @@ class cloud::database::sql (
provider => 'mysql',
require => File['/root/.my.cnf']
}
file{'/etc/mysql/debian.cnf':
ensure => file,
content => template('cloud/database/debian.cnf.erb'),
@@ -110,9 +113,6 @@ class cloud::database::sql (
require => Exec['clean-mysql-binlog'],
}
}
default: {
err "${::osfamily} not supported yet"
}
}
# This is due to this bug: https://bugs.launchpad.net/codership-mysql/+bug/1087368
@@ -224,11 +224,6 @@ class cloud::database::sql (
privileges => ['all']
}
# TODO(Gonéri):
# Here we should do the db_sync.
# https://github.com/enovance/puppet-openstack-cloud/issues/156
Database_user<<| |>>
} # if $::hostname == $galera_master
@@ -256,7 +251,7 @@ class cloud::database::sql (
group => 'root';
}
# Hack for Debian. The puppet-xinetd module do not correctly reload
# The puppet-xinetd module do not correctly reload
# the configuration on “notify”
# TODO(Gonéri): remove this once https://github.com/puppetlabs/puppetlabs-xinetd/pull/9
# get merged