diff --git a/development/Vagrantfile.lxc b/development/Vagrantfile.lxc index c062bba..46f1698 100644 --- a/development/Vagrantfile.lxc +++ b/development/Vagrantfile.lxc @@ -14,9 +14,8 @@ end Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| - config.vm.box = "lxc-quantal64-2013-03-08" - config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-08.box' - config.vm.hostname = "lxc-quantal64" + config.vm.box = "lxc-quantal64-2013-03-10" + config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box' config.vm.synced_folder "../", "/vagrant", name: 'vagrant-root' @@ -30,8 +29,6 @@ Vagrant.configure("2") do |config| lxc.start_opts << 'lxc.aa_profile=unconfined' end - config.vm.provision :shell, :path => 'shell-provisioning/install-puppet' - config.vm.provision :puppet do |puppet| puppet.manifests_path = "." puppet.manifest_file = "site.pp" diff --git a/development/shell-provisioning/install-puppet b/development/shell-provisioning/install-puppet deleted file mode 100755 index d3dcf10..0000000 --- a/development/shell-provisioning/install-puppet +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -e - -if `which puppet > /dev/null`; then - exit 0 -fi - -echo 'An old kernel was found on the guest machine and it will be upgraded' 1>&2 -echo 'Please reload the box after provisioning when finished' 1>&2 - -sudo apt-get update -sudo apt-get install puppet -y diff --git a/example/Vagrantfile b/example/Vagrantfile index 941582a..2d56825 100644 --- a/example/Vagrantfile +++ b/example/Vagrantfile @@ -15,7 +15,7 @@ Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| config.vm.box = "quantal64" - config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-08.box' + config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box' config.vm.hostname = 'lxc-quantal64' config.vm.synced_folder "/tmp", "/vagrant_data" @@ -30,16 +30,6 @@ Vagrant.configure("2") do |config| config.vm.provision :shell, :inline => <<-SCRIPT echo "Hi there I'm a 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 :puppet do |puppet|