diff options
| author | Micah Anderson <micah@riseup.net> | 2007-11-05 22:22:05 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2007-11-05 22:22:05 +0000 |
| commit | 3c8a8802156903a8bebd70804d6a5ebad38d267b (patch) | |
| tree | 3a1516340270cbb609f9ef7e2b6c79a3013a11ef | |
| parent | fc0da24919241c2b2d2bff95ccad4bbd9707d0ca (diff) | |
| download | puppet-virtual-3c8a8802156903a8bebd70804d6a5ebad38d267b.tar.gz puppet-virtual-3c8a8802156903a8bebd70804d6a5ebad38d267b.tar.bz2 | |
fix the delete method
| -rw-r--r-- | manifests/vserver.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 968e949..c4f4d82 100644 --- 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}", } } } |