Skip to content

Fix mysql service on Ubuntu. #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2012
Merged

Fix mysql service on Ubuntu. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
}
}


file { '/etc/mysql':
ensure => directory,
mode => '0755',
Expand Down
9 changes: 9 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
$server_package_name = 'mysql-server'
$etc_root_password = false

case $::operatingsystem {
"Ubuntu": {
$service_provider = upstart
}
default: {
$service_provider = undef
}
}

case $::osfamily {
'RedHat': {
$service_name = 'mysqld'
Expand Down
18 changes: 10 additions & 8 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
# Sample Usage:
#
class mysql::server (
$package_name = $mysql::params::server_package_name,
$package_ensure = 'present',
$service_name = $mysql::params::service_name,
$config_hash = {}
$package_name = $mysql::params::server_package_name,
$package_ensure = 'present',
$service_name = $mysql::params::service_name,
$service_provider = $mysql::params::service_provider,
$config_hash = {}
) inherits mysql::params {

Class['mysql::server'] -> Class['mysql::config']
Expand All @@ -31,10 +32,11 @@
}

service { 'mysqld':
name => $service_name,
ensure => running,
enable => true,
require => Package['mysql-server'],
name => $service_name,
ensure => running,
enable => true,
require => Package['mysql-server'],
provider => $service_provider,
}

}
25 changes: 21 additions & 4 deletions spec/classes/mysql_server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,36 @@
}
end

describe 'when ubuntu use upstart' do
let :facts do
{ :osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
}
end

it { should contain_service('mysqld').with(
:name => 'mysql',
:ensure => 'running',
:enable => 'true',
:provider => 'upstart',
:require => 'Package[mysql-server]'
)}
end

describe 'with osfamily specific defaults' do
{
'Debian' => {
:service_name => 'mysql'
:service_name => 'mysql'
},
'Redhat' => {
:service_name => 'mysqld'
:service_name => 'mysqld'
}
}.each do |osfamily, osparams|

describe "when osfamily is #{osfamily}" do

let :facts do
{:osfamily => osfamily}
{ :osfamily => osfamily }
end

[
Expand All @@ -40,7 +56,6 @@
constant_parameter_defaults.merge(osparams)
end


let :params do
passed_params
end
Expand All @@ -60,6 +75,8 @@
:enable => 'true',
:require => 'Package[mysql-server]'
)}

it { should contain_service('mysqld').without_provider }
end
end
end
Expand Down