Skip to content
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.

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

Fix Service[oddjobd] failing to start #22

Merged
merged 2 commits into from
Aug 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ group :unit_tests do
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'metadata-json-lint', :require => false
gem 'json', :require => false
gem 'puppet-lint-trailing_newline-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'puppet-lint-absolute_template_path', :require => false
Expand Down Expand Up @@ -46,4 +45,19 @@ else
gem 'puppet', '~> 3.8', :require => false
end

# Fix Travis failures related to MRI <> Gem compatibilities.
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
# rspec must be v2 for ruby 1.8.7
gem 'rspec', '~> 2.0'
# rake >= 11 does not support ruby 1.8.7
gem 'rake', '~> 10.0'
end

if RUBY_VERSION < '2.0'
# json 2.x requires ruby 2.0. Lock to 1.8
gem 'json', '~> 1.8'
# json_pure 2.0.2 requires ruby 2.0. Lock to 2.0.1
gem 'json_pure', '= 2.0.1'
end

# vim:ft=ruby
9 changes: 8 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
# [*service_ensure*]
# Ensure if services should be running/stopped
#
# [*service_dependencies*]
# Array of service resource names to manage before managing sssd related
# services. Intended to be used to manage messagebus service to prevent
# `Error: Could not start Service[oddjobd]`.
#
# === Examples
#
# class {'::sssd':
Expand Down Expand Up @@ -76,6 +81,7 @@
$mkhomedir = $sssd::params::mkhomedir,
$manage_oddjobd = $sssd::params::manage_oddjobd,
$service_ensure = $sssd::params::service_ensure,
$service_dependencies = $sssd::params::service_dependencies,
$enable_mkhomedir_flags = $sssd::params::enable_mkhomedir_flags,
$disable_mkhomedir_flags = $sssd::params::disable_mkhomedir_flags,
) inherits sssd::params {
Expand All @@ -93,7 +99,8 @@
validate_array(
$extra_packages,
$enable_mkhomedir_flags,
$disable_mkhomedir_flags
$disable_mkhomedir_flags,
$service_dependencies
)

validate_absolute_path(
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
$sssd_package = 'sssd'
$sssd_service = 'sssd'
$service_ensure = 'running'
$service_dependencies = ['messagebus']
$config_file = '/etc/sssd/sssd.conf'
$mkhomedir = true

Expand All @@ -57,6 +58,7 @@
$sssd_package = 'sssd'
$sssd_service = 'sssd'
$service_ensure = 'running'
$service_dependencies = []
$config_file = '/etc/sssd/sssd.conf'
$mkhomedir = true
$extra_packages = [
Expand Down
20 changes: 16 additions & 4 deletions manifests/service.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
# See README.md for usage information
class sssd::service (
$sssd_service = $sssd::sssd_service,
$mkhomedir = $sssd::mkhomedir,
$manage_oddjobd = $sssd::manage_oddjobd,
$service_ensure = $sssd::service_ensure,
$sssd_service = $sssd::sssd_service,
$mkhomedir = $sssd::mkhomedir,
$manage_oddjobd = $sssd::manage_oddjobd,
$service_dependencies = $sssd::service_dependencies,
$service_ensure = $sssd::service_ensure,
) {

if ! empty($service_dependencies) {
service { $service_dependencies:
ensure => running,
hasstatus => true,
hasrestart => true,
enable => true,
before => Service[$sssd_service],
}
}

service { $sssd_service:
ensure => $service_ensure,
enable => true,
Expand Down