diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-29 18:18:22 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-29 18:18:22 -0200 |
| commit | 3fe78a5320b30f16b9abbab568a7952bf0f6fe1a (patch) | |
| tree | db14104ecd636ea56cf18174ad64e0c9dc45c49e | |
| parent | 9f0687bb2767f1d75b3e462376f82b0ea6fa2f4e (diff) | |
| download | puppet-virtual-3fe78a5320b30f16b9abbab568a7952bf0f6fe1a.tar.gz puppet-virtual-3fe78a5320b30f16b9abbab568a7952bf0f6fe1a.tar.bz2 | |
Minor fixes/changes
| -rw-r--r-- | files/vserver/build_vserver | 18 | ||||
| -rw-r--r-- | manifests/vserver.pp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver index 260889c..9f69c7f 100644 --- a/files/vserver/build_vserver +++ b/files/vserver/build_vserver @@ -1,11 +1,11 @@ #!/bin/bash -NAME=$1 -CONTEXT=$2 -RELEASE=$3 -DEBOOTSTRAP_MIRROR=$4 -VHOSTNAME=$5 -VINTERFACE=$6 +NAME="$1" +CONTEXT="$2" +RELEASE="$3" +DEBOOTSTRAP_MIRROR="$4" +VHOSTNAME="$5" +VINTERFACE="$6" if [ $VHOSTNAME != "none" ]; then VHOSTNAME="--hostname $VHOSTNAME" @@ -33,11 +33,11 @@ echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts # Setup is complete, now do the post-install stuff vserver $NAME start vserver $NAME exec dselect update -# install a few packages needed for facter -vserver $NAME exec apt-get -y install lsb-release iproute +# install a few needed packages +vserver $NAME exec apt-get -y install lsb-release iproute cron sudo openssh-server + #vserver $NAME exec dpkg --install var/lib/puppet/modules/dbp/puppet_current.deb #vserver $NAME exec apt-get -fy install - #echo "Please sign now: puppetca --sign $NAME" >&2 echo "VServer $NAME created" diff --git a/manifests/vserver.pp b/manifests/vserver.pp index c474bbf..3960bab 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -131,7 +131,7 @@ define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', } } false: { - exec { "/usr/local/bin/build_vserver \"${vs_name}\" ${context} ${distro} ${debootstrap_mirror} ${vs_hostname} ${interface}": + exec { "/usr/local/bin/build_vserver \"${vs_name}\" ${context} ${distro} ${debootstrap_mirror} ${vs_hostname} ${vs_interface}": creates => "/etc/vservers/${vs_name}", require => File["/usr/local/bin/build_vserver"], alias => "vs_create_${vs_name}" |