Added ensure_resource and ensure_packages to avoid collisions

Gemfile

@@ -22,15 +22,14 @@ group :unit_tests do
 end
 
 group :development do
- gem 'simplecov',  :require => false
+ gem 'simplecov', :require => false
  # gem 'guard-rake', :require => false
  gem 'librarian-puppet', :require => false
 end
 
 group :system_tests do
  # gem 'vagrant-wrapper', :require => false
- gem 'beaker-rspec', :require => false
- gem 'serverspec', :require => false
+ gem 'serverspec', :require => false
 end
 
 if (facterversion = ENV['FACTER_GEM_VERSION'])
@@ -60,4 +59,10 @@ if RUBY_VERSION < '2.0'
  gem 'json_pure', '= 2.0.1'
 end
 
+if RUBY_VERSION < '2.2.5'
+ # beaker 3.1+ requires ruby 2.2.5. Lock to 2.0
+ gem 'beaker', '~> 2.0', :require => false
+ # beaker-rspec 6.0.0 requires beaker 3.0. Lock to 5.6.0
+ gem 'beaker-rspec', '= 5.6.0', :require => false
+end
 # vim:ft=ruby

examples/ad.pp

@@ -1,6 +1,6 @@
 class {'::sssd':
  config => {
- 'sssd' => {
+ 'sssd'  => {
  'domains' => 'ad.example.com',
  'config_file_version' => 2,
  'services' => ['nss', 'pam'],

examples/ipa.pp

@@ -1,6 +1,6 @@
 class {'::sssd':
  config => {
- 'sssd' => {
+ 'sssd'  => {
  'domains' => 'example.com',
  'config_file_version' => 2,
  'services' => ['nss', 'sudo', 'pam', 'ssh'],

examples/ldap.pp

@@ -1,6 +1,6 @@
 class {'::sssd':
  config => {
- 'sssd' => {
+ 'sssd'  => {
  'domains' => 'example.com',
  'config_file_version' => 2,
  'services' => ['nss', 'pam'],

manifests/install.pp

@@ -6,15 +6,14 @@
  $extra_packages_ensure = $sssd::extra_packages_ensure,
 ) {
 
- package { $sssd_package:
- ensure => $sssd_package_ensure,
- }
+ ensure_resource('package', $sssd_package, { ensure => $sssd_package_ensure })
 
  if $extra_packages {
- package { $extra_packages:
- ensure => $extra_packages_ensure,
- require => Package[$sssd_package],
- }
+ ensure_packages($extra_packages,
+ {
+ ensure => $extra_packages_ensure,
+ require => Package[$sssd_package],
+ }
+ )
  }
-
 }

manifests/service.pp

@@ -8,32 +8,35 @@
 ) {
 
  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,
- hasstatus => true,
- hasrestart => true,
+ ensure_resource('service', $service_dependencies,
+ {
+ ensure => running,
+ hasstatus => true,
+ hasrestart => true,
+ enable => true,
+ before => Service[$sssd_service],
+ }
+ )
  }
 
- if $mkhomedir and $manage_oddjobd {
-
- service { 'oddjobd':
+ ensure_resource('service', $sssd_service,
+ {
  ensure => $service_ensure,
  enable => true,
  hasstatus => true,
  hasrestart => true,
- require => Service[$sssd_service],
  }
+ )
 
+ if $mkhomedir and $manage_oddjobd {
+ ensure_resource('service', 'oddjobd',
+ {
+ ensure => $service_ensure,
+ enable => true,
+ hasstatus => true,
+ hasrestart => true,
+ require => Service[$sssd_service],
+ }
+ )
  }
-
 }

metadata.json

@@ -41,6 +41,6 @@
  }
  ],
  "dependencies": [
- {"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0 < 5.0.0"}
+ {"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0 < 5.0.0"}
  ]
 }