diff options
| author | Pietro Ferrari <pietro@riseup.net> | 2008-11-11 02:20:41 +0000 |
|---|---|---|
| committer | Pietro Ferrari <pietro@riseup.net> | 2008-11-11 02:20:41 +0000 |
| commit | 0fdfc7d93be57eac136d2101f78d0d95d53e27af (patch) | |
| tree | 205244170158044e18c18db80c3bbe650e169267 | |
| parent | b43b2a2d5b0c424f3fce801f9158af60df20978a (diff) | |
| download | puppet-virtual-0fdfc7d93be57eac136d2101f78d0d95d53e27af.tar.gz puppet-virtual-0fdfc7d93be57eac136d2101f78d0d95d53e27af.tar.bz2 | |
add a distro parameter to the vserver definiton and remove cronjob to run puppet on the vserver form the host.
| -rw-r--r-- | manifests/vserver.pp | 6 |
1 files changed, 1 insertions, 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, } } |