Changing variable names and defaults

diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver
index 569451bf41bb7e7de3d53b30db5665104676f1cc..6fd10739f1f44c5d1ed061d0e833f8bb4d47c1f2 100644 (file)
--- a/files/vserver/build_vserver
+++ b/files/vserver/build_vserver
@@ -4,20 +4,20 @@ NAME=$1
 CONTEXT=$2
 RELEASE=$3
 DEBOOTSTRAP_MIRROR=$4
-HOSTNAME=$5
-INTERFACE=$6
+VHOSTNAME=$5
+VINTERFACE=$6
 
 if [ $HOSTNAME != "none" ]; then
-  hostname="--hostname $HOSTNAME"
+  VHOSTNAME="--hostname $VHOSTNAME"
 fi
 
 if [ ! -z $INTERFACE]; then
-  interface="--interface $INTERFACE"
+  VINTERFACE="--interface $VINTERFACE"
 fi
 
 # create basic vserver
 vserver $NAME build -n $NAME --context $CONTEXT \
-        $hostname $interace -m debootstrap -- -d $RELEASE -m $DEBOOTSTRAP_MIRROR
+        $VHOSTNAME $VINTERFACE -m debootstrap -- -d $RELEASE -m $DEBOOTSTRAP_MIRROR
 
 # copy in some some defaults
 TARGET=/etc/vservers/$NAME/vdir/

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 4709ac8e64483b25a7a8f7271a96b55c80896f88..459d1fd54b6c8cc88e4c906feb567a6273f8a005 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -103,8 +103,9 @@ class vserver::host {
 
 define vs_create($in_domain, $context, $legacy = false, $distro = 'etch',
                  $debootstrap_mirror = 'http://ftp.debian.org/debian', $hostname = false, $interface = false) { 
-  $vs_name     = $legacy   ? { true  => $name, false => $in_domain ? { '' => $name, default => "${name}.${in_domain}" } }
-  $vs_hostname = $hostname ? { false => 'none', default => $hostname }
+  $vs_name      = $legacy    ? { true  => $name, false => $in_domain ? { '' => $name, default => "${name}.${in_domain}" } }
+  $vs_hostname  = $hostname  ? { false => 'none', default => $hostname }
+  $vs_interface = $interface ? { false => 'none', default => $interface }
 
   case $vs_name { '': { fail ( "Cannot create VServer with empty name" ) } }