From 94a556de465a7abe0d6a1e8b99763ab08c746dda Mon Sep 17 00:00:00 2001
From: Ivan Udovichenko <iudovichenko@mirantis.com>
Date: Thu, 11 Dec 2014 17:34:22 +0200
Subject: [PATCH] Remove hardcoded commands

Add more modern and convenient way to remove users and directories.

Change-Id: I4bc0e7ced93a0c6b3faf7f65e5036ed0cd9bee89
Counter: 2
---
 modules/user/manifests/virtual/disable.pp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/user/manifests/virtual/disable.pp b/modules/user/manifests/virtual/disable.pp
index e7aef18d14..9d45686678 100644
--- a/modules/user/manifests/virtual/disable.pp
+++ b/modules/user/manifests/virtual/disable.pp
@@ -6,9 +6,8 @@ define user::virtual::disable(
 ) {
   $username = $title
   #1. Remove user
-  exec { "disable_${username}":
-    command => "userdel ${username}",
-    onlyif  => "grep ^${username}: /etc/passwd",
+  user { "${username}":
+    ensure => absent,
   }
   #2. remove sshkeys file(s)
   file { "rm_authorized_keys_${username}":
@@ -20,9 +19,12 @@ define user::virtual::disable(
     path    => "/home/${username}/.ssh/authorized_keys2",
   }
   #3. rm screen dir (just in case)
-  exec { "rm_screen_${username}":
-    command => "rm -rf /var/run/screen/S-${username}",
-    onlyif  => "ls /var/run/screen/S-${username}",
+  file { "rm_screen_${username}":
+    ensure => absent,
+    path => "/var/run/screen/S-${username}",
+    recurse => true,
+    purge => true,
+    force => true,
   }
 }