add a distro parameter to the vserver definiton and remove cronjob to run puppet...

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index e05c3819ee455ed9623f016896efe54d3fb5f519..18f5804f48ddf469bb80f43fb9617fea6a153681 100644 (file)
--- 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, } }