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.

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

Messagebus fix #39

Merged
merged 2 commits into from
May 17, 2017
Merged

Messagebus fix #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0dd633
Refactor RedHat params to be explicit on supported versions
ghoneycutt May 16, 2017
74f554d
(fix) Add messagebus as a service dependency for EL6
ghoneycutt May 16, 2017
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
7 changes: 7 additions & 0 deletions manifests/dependencies.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@
$service_ensure = $sssd::service_ensure,
) {

if $manage_oddjobd == true {
$before = 'Service[oddjobd]'
} else {
$before = undef
}

if ! empty($service_dependencies) {
ensure_resource('service', $service_dependencies,
{
ensure => running,
hasstatus => true,
hasrestart => true,
enable => true,
before => $before,
}
)
}
Expand Down
46 changes: 30 additions & 16 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,37 @@
$config_file = '/etc/sssd/sssd.conf'
$mkhomedir = true

if versioncmp($::operatingsystemrelease, '6.0') < 0 {
$service_dependencies = ['messagebus']
$extra_packages = [
'authconfig',
]
$extra_packages_ensure = 'latest'
$manage_oddjobd = false
} else {
$service_dependencies = []
$extra_packages = [
'authconfig',
'oddjob-mkhomedir',
]
$extra_packages_ensure = 'present'
$manage_oddjobd = true
case $::operatingsystemrelease {
default: {
fail("operatingsystemrelease is <${::operatingsystemrelease}> and must be in 5, 6 or 7.")
}
/^5/: {
$service_dependencies = ['messagebus']
$extra_packages = [
'authconfig',
]
$extra_packages_ensure = 'latest'
$manage_oddjobd = false
}
/^6/: {
$service_dependencies = ['messagebus']
$extra_packages = [
'authconfig',
'oddjob-mkhomedir',
]
$extra_packages_ensure = 'present'
$manage_oddjobd = true
}
/^7/: {
$service_dependencies = []
$extra_packages = [
'authconfig',
'oddjob-mkhomedir',
]
$extra_packages_ensure = 'present'
$manage_oddjobd = true
}
}

}

'Debian': {
Expand Down
21 changes: 21 additions & 0 deletions spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

it { is_expected.to contain_service('sssd').with_ensure('running') }
it { is_expected.to contain_package('sssd').with_ensure('present') }
it { is_expected.to contain_service('messagebus').with_ensure('running') }
end

context 'with service ensure stopped' do
Expand Down Expand Up @@ -56,6 +57,23 @@
it { is_expected.to contain_package('sssd').with_ensure('1.1.1') }
end
end

describe 'on unsupported version of RedHat (not 5, 6 or 7)' do
let(:facts) do
{
:osfamily => 'RedHat',
:operatingsystemrelease => '4.0',
:rubyversion => '1.9.3'
}
end

it 'should fail' do
expect do
should contain_class('sssd')
end.to raise_error(Puppet::Error, /operatingsystemrelease is <4\.0> and must be in 5, 6 or 7/)
end
end

describe 'on RedHat 6.6' do
let(:facts) do
{
Expand Down Expand Up @@ -85,6 +103,7 @@
it { is_expected.to contain_service('sssd').with_ensure('running') }
it { is_expected.to contain_package('sssd').with_ensure('present') }
it { is_expected.to contain_service('oddjobd').with_ensure('running') }
it { is_expected.to contain_service('messagebus').with_ensure('running') }
end

context 'with service ensure stopped' do
Expand Down Expand Up @@ -143,6 +162,7 @@
it { is_expected.to contain_service('sssd').with_ensure('running') }
it { is_expected.to contain_package('sssd').with_ensure('present') }
it { is_expected.to contain_service('oddjobd').with_ensure('running') }
it { is_expected.not_to contain_service('messagebus') }
end

context 'with service ensure stopped' do
Expand Down Expand Up @@ -200,6 +220,7 @@

it { is_expected.to contain_service('sssd').with_ensure('running') }
it { is_expected.to contain_package('sssd').with_ensure('present') }
it { is_expected.not_to contain_service('messagebus') }
end

context 'with service ensure stopped' do
Expand Down