Fix vm bootstrapping

refs #5223

diff --git a/test/jenkins/bootstrap-vm.sh b/test/jenkins/bootstrap-vm.sh
index 586938d5de4cdddf8fc390f279bdf3b5d9be07ca..b12896fc6e26226db8237b988a264d4b7295427d 100755 (executable)
--- a/test/jenkins/bootstrap-vm.sh
+++ b/test/jenkins/bootstrap-vm.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 if [ "$1" != "--force" ]; then
-       echo 'This script is NOT intended to be ran by an individual user.' \
+    echo 'This script is NOT intended to be ran by an individual user.' \
          'If you are not human, pass "--force" as the first option to it!'
-       exit 1
+    exit 1
 fi
 
 if [ $# -lt 3 ]; then
@@ -18,12 +18,12 @@ host=$3
 SSH_OPTIONS="-o PasswordAuthentication=no"
 SSH="ssh $SSH_OPTIONS $user@$host"
 
-$SSH "mkdir -p /tmp/icinga2/puppet-stuff"
-scp -r ../../.vagrant-puppet $user@$host:/tmp/icinga2/puppet-stuff
+$SSH "mkdir /vagrant"
+scp -qr ../../.vagrant-puppet $user@$host:/vagrant
 
 $SSH "groupadd vagrant"
 $SSH "echo '10.10.27.1 packages.icinga.org' >> /etc/hosts"
-$SSH "puppet apply --modulepath=/tmp/icinga2/puppet-stuff/modules" \
-     "             /tmp/icinga2/puppet-stuff/manifests/default.pp"
+$SSH "puppet apply --modulepath=/vagrant/.vagrant-puppet/modules" \
+     "             /vagrant/.vagrant-puppet/manifests/default.pp"
 
 exit 0