aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-03-20 15:16:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-03-20 15:16:57 -0300
commit915b64e7343d4e37c7eafad50535f442b7094d47 (patch)
treee166cd013826dc906694e14fd09bd27c7833cab3
parent1d837a61bdce36bf150f109f0fd11baae5be667a (diff)
parentd6164c21fc1a665bdd4e9532d8dba2e2712cf8ad (diff)
downloadpuppet-nodo-915b64e7343d4e37c7eafad50535f442b7094d47.tar.gz
puppet-nodo-915b64e7343d4e37c7eafad50535f442b7094d47.tar.bz2
Merge branch 'master' of ssh://git.sarava.org:2204/puppet-nodo
-rw-r--r--manifests/vserver.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index e9be096..b77871c 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -37,7 +37,7 @@ class nodo::vserver inherits nodo {
define instance($context, $ensure = 'running', $proxy = false,
$puppetmaster = false, $gitd = false, $mail = false,
$icecast = false, $sound = false, $ticket = false,
- $memory_limit = false) {
+ $memory_limit = false, $distro = 'lenny') {
# set instance id
if $context <= 9 {
@@ -60,7 +60,7 @@ class nodo::vserver inherits nodo {
ensure => $ensure,
context => "$context",
mark => 'default',
- distro => 'lenny',
+ distro => $distro,
interface => "eth0:192.168.0.$context/24",
hostname => "$name.$domain",
memory_limit => $memory_limit,