stackforge/puppet-openstack-cloud
Code Issues Proposed changes

cloud::database::sql wrong mariadb packages name

Browse Source 
Change mariadb packages name on Redhat.
Fix puppet Package requirement on Redhat and Debian.

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
This commit is contained in:
Dimitri Savineau
2014-09-30 10:42:52 -04:00
parent 02af63547d
commit ff1011e55a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/database/sql.pp
View File

@@ -166,8 +166,8 @@ class cloud::database::sql (
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
# Specific to Red Hat # Specific to Red Hat
$mysql_server_package_name = 'MariaDB-Galera-server' $mysql_server_package_name = 'mariadb-galera-server'
$mysql_client_package_name = 'MariaDB-client' $mysql_client_package_name = 'mariadb'
$wsrep_provider = '/usr/lib64/galera/libgalera_smm.so' $wsrep_provider = '/usr/lib64/galera/libgalera_smm.so'
$mysql_server_config_file = '/etc/my.cnf' $mysql_server_config_file = '/etc/my.cnf'
@@ -194,7 +194,7 @@ class cloud::database::sql (
command => '/usr/bin/mysql_install_db --rpm --user=mysql', command => '/usr/bin/mysql_install_db --rpm --user=mysql',
unless => 'test -d /var/lib/mysql/mysql', unless => 'test -d /var/lib/mysql/mysql',
before => Service['mysqld'], before => Service['mysqld'],
require => [Package['mysql-server'], File[$mysql_server_config_file]] require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]]
} }
} # RedHat } # RedHat
@@ -245,7 +245,7 @@ class cloud::database::sql (
mode => '0755', mode => '0755',
group => 'root', group => 'root',
notify => Service['mysqld'], notify => Service['mysqld'],
before => Package['mysql-server'], before => Package[$mysql_server_package_name],
} }
if($::osfamily == 'Debian'){ if($::osfamily == 'Debian'){
@@ -257,7 +257,7 @@ class cloud::database::sql (
line => 'MYSQLD_STARTUP_TIMEOUT=120', line => 'MYSQLD_STARTUP_TIMEOUT=120',
path => '/etc/init.d/mysql', path => '/etc/init.d/mysql',
after => '^CONF=', after => '^CONF=',
require => Package['mysql-server'], require => Package[$mysql_server_package_name],
notify => Service['mysqld'], notify => Service['mysqld'],
} }
} }
@@ -282,7 +282,7 @@ class cloud::database::sql (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
notify => [Service['mysqld'],Exec['clean-mysql-binlog']], notify => [Service['mysqld'],Exec['clean-mysql-binlog']],
require => Package['mysql-server'], require => Package[$mysql_server_package_name],
} }
class { 'mysql::client': class { 'mysql::client':

4
spec/classes/cloud_database_sql_spec.rb
View File

@@ -231,8 +231,8 @@ describe 'cloud::database::sql' do
end end
let :platform_params do let :platform_params do
{ :mysql_server_package_name => 'MariaDB-Galera-server', { :mysql_server_package_name => 'mariadb-galera-server',
:mysql_client_package_name => 'MariaDB-client', :mysql_client_package_name => 'mariadb',
:mysql_server_config_file => '/etc/my.cnf', :mysql_server_config_file => '/etc/my.cnf',
:wsrep_provider => '/usr/lib64/galera/libgalera_smm.so' } :wsrep_provider => '/usr/lib64/galera/libgalera_smm.so' }
end end