diff --git a/.gitignore b/.gitignore index 53e1754..ef1ae2b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ Vagrantfile /boxes/**/*.tar.gz /boxes/quantal64/rootfs-amd64/ /boxes/output/ +/development/Vagrantfile diff --git a/development/Vagrantfile b/development/Vagrantfile.dev.lxc similarity index 84% rename from development/Vagrantfile rename to development/Vagrantfile.dev.lxc index f2188c2..e1dcefd 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile.dev.lxc @@ -14,9 +14,9 @@ end Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| - config.vm.box = "lxc-quantal64" + 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.hostname = "lxc-quantal64" config.vm.synced_folder "../", "/vagrant", name: 'vagrant-root' @@ -25,10 +25,9 @@ Vagrant.configure("2") do |config| "/var/cache/apt/archives/", name: "vagrant-cache" - config.vm.provider :lxc do |lxc| - # Not sure we need this - lxc.start_opts << 'lxc.aa_profile=unconfined' - end + config.vm.provision :shell, inline: ' + sudo apt-get update && + sudo apt-get install puppet -y' config.vm.provision :puppet do |puppet| puppet.manifests_path = "."