From 0fdfc7d93be57eac136d2101f78d0d95d53e27af Mon Sep 17 00:00:00 2001 From: Pietro Ferrari Date: Tue, 11 Nov 2008 02:20:41 +0000 Subject: add a distro parameter to the vserver definiton and remove cronjob to run puppet on the vserver form the host. --- manifests/vserver.pp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/manifests/vserver.pp b/manifests/vserver.pp index e05c381..18f5804 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -75,7 +75,7 @@ define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', $deboo # ensure: present, stopped, running -define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false) { +define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false, $distro = 'etch') { case $in_domain { '': {} default: { err("${fqdn}: vserver ${name} uses deprecated \$in_domain" ) } } @@ -85,10 +85,6 @@ define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false) $if_dir = "/etc/vservers/${vs_name}/interfaces" $mark_file = "/etc/vservers/${vs_name}/apps/init/mark" - $vs_name_underscores = gsub($vs_name, '\.', '_') - $cron_job = "/etc/cron.daily/puppet-vserver-${vs_name_underscores}" - - # TODO: wasn't there a syntax for using arrays as case selectors?? case $ensure { present: { vs_create{$name: in_domain => $in_domain, context => $context, legacy => $legacy, distro => $distro, } } -- cgit v1.2.3