Merge pull request #1616 from chr4/userdel-force

Add "force" attribute to resource/user, passing "-f" to userdel

2 files changed, 10 insertions, 0 deletions

diff --git a/lib/chef/provider/user/useradd.rb b/lib/chef/provider/user/useradd.rb
index cad9d58e7e..cc770c0be2 100644
--- a/lib/chef/provider/user/useradd.rb
+++ b/lib/chef/provider/user/useradd.rb
@@ -46,6 +46,7 @@ class Chef
         def remove_user
           command = [ "userdel" ]
           command << "-r" if managing_home_dir?
+          command << "-f" if new_resource.force
           command << new_resource.username
           shell_out!(*command)
         end
diff --git a/lib/chef/resource/user.rb b/lib/chef/resource/user.rb
index 357d6d12ea..05c076229f 100644
--- a/lib/chef/resource/user.rb
+++ b/lib/chef/resource/user.rb
@@ -38,6 +38,7 @@ class Chef
         @password = nil
         @system = false
         @manage_home = false
+        @force = false
         @non_unique = false
         @action = :create
         @supports = {
@@ -121,6 +122,14 @@ class Chef
         )
       end
 
+      def force(arg=nil)
+        set_or_return(
+          :force,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
       def non_unique(arg=nil)
         set_or_return(
           :non_unique,