X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vagrant.git;a=blobdiff_plain;f=Vagrantfile;h=ea2f26ff2569ace327647a00e1c4b53977b06cdd;hp=841e945abe1e51f89d6c94f339fcaa3267bfd202;hb=18485d9f5e68d1b650edf5a0f6e5a49fe06a83c0;hpb=4b84e4d89cdc7c4d873376afed056b984e8f6413

diff --git a/Vagrantfile b/Vagrantfile
index 841e945..ea2f26f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -74,16 +74,37 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # # }
   #
 
-  #config.vm.provision :puppet do |puppet|
+  # Install relevant puppet modules
+
+  config.vm.provision :shell, :run => "always" do |shell|
+    shell.inline = %{
+      mkdir -p /etc/puppet/modules;
+      function install_module {
+        folder=`echo $1 | sed s/.*-//`
+        if [ ! -d /etc/puppet/modules/$folder ]; then
+          puppet module install $1
+        fi
+      }
+      install_module puppetlabs-vcsrepo
+#     install_module stdlib
+#      install_module apt
+#      install_module ruby
+    }
+  end
+
+
+  # Now run puppet
+
+  config.vm.provision :puppet do |puppet|
     #puppet.facter = {
     #	"kiosk_url" => "http://map.ipviking.com/",
     #}
 
-  #  puppet.manifests_path = "puppet/manifests"
+    puppet.manifests_path = "puppet/manifests"
 
-  #  puppet.module_path = "puppet/modules"
-  #  puppet.manifest_file  = "init.pp"
-  #  puppet.options = "--verbose --debug"
-  #end
+    puppet.module_path = "puppet/modules"
+    puppet.manifest_file  = "init.pp"
+    puppet.options = "--verbose --debug"
+  end
 
 end