stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #563 from enovance/mysql-2.2

Browse Source 
Fix MySQL service with PL-2.2
This commit is contained in:
Emilien Macchi 2014-08-06 16:50:24 +02:00
commit ea76dbef74
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/database/sql.pp
View File

@ -247,7 +247,11 @@ class cloud::database::sql (
require => File['/root/.my.cnf'] require => File['/root/.my.cnf']
} }
mysql_grant { "${galera_clustercheck_dbuser}@localhost/monitoring": mysql_grant { "${galera_clustercheck_dbuser}@localhost/monitoring":
privileges => ['ALL'] ensure => 'present',
options => ['GRANT'],
privileges => ['ALL'],
table => 'monitoring.*',
user => "${galera_clustercheck_dbuser}@localhost",
} }
Database_user<<| |>> Database_user<<| |>>
@ -291,11 +295,7 @@ class cloud::database::sql (
# first sync take a long time # first sync take a long time
command => "/bin/bash -c '/usr/bin/mysqladmin --defaults-file=/root/.my.cnf shutdown ; /bin/rm ${::mysql::params::datadir}/ib_logfile*'", command => "/bin/bash -c '/usr/bin/mysqladmin --defaults-file=/root/.my.cnf shutdown ; /bin/rm ${::mysql::params::datadir}/ib_logfile*'",
path => '/usr/bin', path => '/usr/bin',
require => [ notify => Service['mysqld'],
File['/root/.my.cnf'],
Service['mysqld'],
],
notify => Exec['mysqld-restart'],
refreshonly => true, refreshonly => true,
onlyif => "stat ${::mysql::params::datadir}/ib_logfile0 && test `du -sh ${::mysql::params::datadir}/ib_logfile0 | cut -f1` != '256M'", onlyif => "stat ${::mysql::params::datadir}/ib_logfile0 && test `du -sh ${::mysql::params::datadir}/ib_logfile0 | cut -f1` != '256M'",
} }