From 6f6d14aee7aef43c7cd555341bd7050c7379fba3 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Mon, 4 Mar 2013 19:34:11 -0300 Subject: [PATCH] Skip puppet installation on example vagrant file since the box's after-create script handles that now --- example/Vagrantfile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/example/Vagrantfile b/example/Vagrantfile index b001eae..c2c6ad4 100644 --- a/example/Vagrantfile +++ b/example/Vagrantfile @@ -14,19 +14,7 @@ Vagrant.configure("2") do |config| lxc.start_opts << 'lxc.cgroup.memory.memsw.limit_in_bytes=500M' end - config.vm.provision :shell, :inline => <<-SCRIPT -echo "Hi there I'm the shell script used for provisioning" -if `which puppet > /dev/null`; then - echo "Looks like puppet has already been installed, moving on" - exit 0 -fi -echo "I'm about to install puppet!" -sleep 1 -echo "Hang tight, I just need to wait for a while since vagrant-lxc is not handling network properly ;)" -sleep 5 -sudo apt-get update -sudo apt-get install puppet -y - SCRIPT + config.vm.provision :shell, :inline => 'echo "Hi there I\'m a shell script used for provisioning"' config.vm.provision :puppet do |puppet| puppet.module_path = "puppet/modules"