Fix puppet provisioning

diff --git a/.gitignore b/.gitignore
index d99c3029a0b76e02093402a79b1d6961ac134bf9..962f7ebc49411feb83fff6b42e627c14902ebe7b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tmp
 /recentchanges
 /www
 build-area
+puppet/modules

diff --git a/bin/debian-dev-setup b/bin/debian-dev-setup
index 5e56385b17f5f5bb9e63799938e24579e9778782..7162b07a440a6386ad4ae1e7bec5d30e045c068f 100755 (executable)
--- a/bin/debian-dev-setup
+++ b/bin/debian-dev-setup
@@ -6,10 +6,12 @@
 # Default provisioner
 if [ -x "/vagrant/puppet/bin/provision" ]; then
   /vagrant/puppet/bin/provision
-  /vagrant/puppet/bin/deploy
 elif [ -x "/home/user/code/debian/puppet/bin/provision" ]; then
   /home/user/code/debian/puppet/bin/provision
-  /home/user/code/debian/puppet/bin/deploy
+fi
+
+if [ -x "/etc/puppet/bin/deploy" ]; then
+  /etc/puppet/bin/deploy
 fi
 
 # Parameter

diff --git a/kvmxfile b/kvmxfile
index 4b015b0633e916dde09b0ea4be0be92cff74619e..b4e2d51048062189235443fa9f4456d006dff653 100644 (file)
--- a/kvmxfile
+++ b/kvmxfile
@@ -20,7 +20,7 @@ password="$RANDOM"
 shared_folders="debian:.:/home/$user/code/debian,distros:/var/data/distros:/var/data/distros"
 
 # Folder to sync during provisioning in the format "/host/folder /guest/folder".
-provision_rsync="$KVMX_BASE/share/provision/ /usr/local/share/kvmx/provision/"
+provision_rsync="puppet /etc/puppet/"
 
 # Absolute path for a provision script located inside the guest.
 provision_command="/usr/local/share/kvmx/provision/development && /home/user/code/$VM/bin/debian-dev-setup"