Skip to content

Commit c84ffde

Browse files
committed
Merge pull request #122 from hunner/optional_service
Optionally manage the mysqld service
2 parents df46407 + 81889c9 commit c84ffde

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

manifests/server.pp

+10-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
$service_name = $mysql::params::service_name,
2121
$service_provider = $mysql::params::service_provider,
2222
$config_hash = {},
23-
$enabled = true
23+
$enabled = true,
24+
$manage_service = true
2425
) inherits mysql::params {
2526

2627
Class['mysql::server'] -> Class['mysql::config']
@@ -40,12 +41,13 @@
4041
$service_ensure = 'stopped'
4142
}
4243

43-
service { 'mysqld':
44-
ensure => $service_ensure,
45-
name => $service_name,
46-
enable => $enabled,
47-
require => Package['mysql-server'],
48-
provider => $service_provider,
44+
if $manage_service {
45+
service { 'mysqld':
46+
ensure => $service_ensure,
47+
name => $service_name,
48+
enable => $enabled,
49+
require => Package['mysql-server'],
50+
provider => $service_provider,
51+
}
4952
}
50-
5153
}

spec/classes/mysql_server_spec.rb

+16-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
let :constant_parameter_defaults do
55
{:config_hash => {},
66
:package_ensure => 'present',
7-
:enabled => true
7+
:enabled => true,
8+
:manage_service => true
89
}
910
end
1011

@@ -53,7 +54,8 @@
5354
:package_ensure => 'latest',
5455
:service_name => 'dans_service',
5556
:config_hash => {'root_password' => 'foo'},
56-
:enabled => false
57+
:enabled => false,
58+
:manage_service => false
5759
}
5860
].each do |passed_params|
5961

@@ -76,14 +78,18 @@
7678
:ensure => param_values[:package_ensure]
7779
)}
7880

79-
it { should contain_service('mysqld').with(
80-
:name => param_values[:service_name],
81-
:ensure => param_values[:enabled] ? 'running' : 'stopped',
82-
:enable => param_values[:enabled],
83-
:require => 'Package[mysql-server]'
84-
)}
85-
86-
it { should contain_service('mysqld').without_provider }
81+
it {
82+
if param_values[:manage_service]
83+
should contain_service('mysqld').with(
84+
:name => param_values[:service_name],
85+
:ensure => param_values[:enabled] ? 'running' : 'stopped',
86+
:enable => param_values[:enabled],
87+
:require => 'Package[mysql-server]'
88+
).without_provider
89+
else
90+
should_not contain_service('mysqld')
91+
end
92+
}
8793
end
8894
end
8995
end

0 commit comments

Comments
 (0)