From: Silvio Rhatto Date: Fri, 25 Dec 2009 02:26:05 +0000 (-0200) Subject: Fixing variable assignments X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0915a963bf42445f7a59d9e776d47c86ef35859a;p=puppet-virtual.git Fixing variable assignments --- diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver index 0f0cea7..3645ea9 100644 --- a/files/vserver/build_vserver +++ b/files/vserver/build_vserver @@ -2,8 +2,8 @@ NAME=$1 CONTEXT=$2 -RELEASE = $3 -DEBOOTSTRAP_MIRROR = $4 +RELEASE=$3 +DEBOOTSTRAP_MIRROR=$4 # create basic vserver vserver $NAME build -m debootstrap -- -d $RELEASE -m $DEBOOTSTRAP_MIRROR diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 616631d..f29b9d6 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -101,7 +101,9 @@ class vserver::host { } } -define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', $debootstrap_mirror = 'http://ftp.debian.org/debian') { +# TODO: hostname +define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', + $debootstrap_mirror = 'http://ftp.debian.org/debian', $hostname = false) { $vs_name = $legacy ? { true => $name, false => $in_domain ? { '' => $name, default => "${name}.${in_domain}" } } case $vs_name { '': { fail ( "Cannot create VServer with empty name" ) } }