Merge pull request #439 from CoreyCook8/patch-1

Remove workaround from user.pp

Author: LukasAud

manifests/user.pp

@@ -234,21 +234,15 @@
       ensure     => 'absent',
       forcelocal => $forcelocal,
       home       => $_home,
-      managehome => false,  # Workaround for PUP-9706; see below.
+      managehome => $managehome,
     }
-    # The core `user` resource will fail when removing users on Solaris if
-    # `ensure => 'absent', managhome => true` and the homedir does not exist.
-    # We therefore force `managehome => false` when `ensure => 'absent'`, and
-    # remove the homedir as a separate operation.
-    # See https://tickets.puppetlabs.com/browse/PUP-9706
-    if $purge_user_home {
+    if $purge_user_home and !$managehome {
       file { $_home:
         ensure  => 'absent',
         recurse => true,
         force   => true,
       }
     }
-    # End workaround.
     User[$name] -> Group <| ensure == 'absent' |>
     if $create_group {
       # Only remove the group if it is the same as user name as it may be shared.

spec/defines/accounts_user_spec.rb

@@ -269,8 +269,7 @@
                 purge_user_home: false }
             end
 
-            it { is_expected.to contain_user(title).with('ensure'     => params[:ensure]) }
-            it { is_expected.to contain_user(title).with('managehome' => params[:purge_user_home]) }
+            it { is_expected.to contain_user(title).with('ensure' => params[:ensure]) }
             it { is_expected.not_to contain_accounts__home_dir(user_vars[:dan_home]) }
             it { is_expected.not_to contain_file("#{user_vars[:dan_home]}/.ssh") }
           end