fix the delete method

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 968e9490ea6e7aa6453cc4dc99f125f4cd969e6f..c4f4d829672716acb4c1833f392a79da12ea549c 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -51,7 +51,7 @@ define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false,
                present: { vs_create{$name: in_domain => $in_domain, legacy => $legacy, distro => $distro, } }
                running: { vs_create{$name: in_domain => $in_domain, legacy => $legacy, distro => $distro, } }
                stopped: { vs_create{$name: in_domain => $in_domain, legacy => $legacy, distro => $distro, } }
-                absent:  { vs_create{$name: in_domain => $in_domain, legacy => $legacy, distro => $distro, } }
+                delete:  { vs_create{$name: in_domain => $in_domain, legacy => $legacy, distro => $distro, } }
                default: { err("${fqdn}: vserver(${vs_name}): unknown ensure '${ensure}'") }
        }
 
@@ -127,9 +127,9 @@ define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false,
                        file { $mark_file: ensure => absent, }
                }
 
-                absent: {
-                       exec { "vserver ${vs_name} delete":
-                              onlyif => "test -e \$(readlink -f /etc/vservers/${vs_name}/run || echo /doesntexist )",
+                delete: {
+                       exec { "/usr/bin/yes | vserver ${vs_name} delete":
+                             alias => "vs_restart_${vs_name}",
                             }
                 }
        }