diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-25 00:26:05 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-25 00:26:05 -0200 |
| commit | 0915a963bf42445f7a59d9e776d47c86ef35859a (patch) | |
| tree | 71cfe72ac8cbe0734f55e22a43a540a711b86b15 | |
| parent | 2ef0291b94715553747c51647a0ac2b0f930b92d (diff) | |
| download | puppet-virtual-0915a963bf42445f7a59d9e776d47c86ef35859a.tar.gz puppet-virtual-0915a963bf42445f7a59d9e776d47c86ef35859a.tar.bz2 | |
Fixing variable assignments
| -rw-r--r-- | files/vserver/build_vserver | 4 | ||||
| -rw-r--r-- | manifests/vserver.pp | 4 |
2 files changed, 5 insertions, 3 deletions
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" ) } } |