@@ -3,28 +3,47 @@

 BOX_NAME = ENV['BOX_NAME'] || "ubuntu"

 BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box"

-PPA_KEY = "E61D797F63561DC6"

 Vagrant::Config.run do |config|

   # Setup virtual machine box. This VM configuration code is always executed.

   config.vm.box = BOX_NAME

   config.vm.box_url = BOX_URI

-  # Add docker PPA key to the local repository and install docker

-  pkg_cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys #{PPA_KEY}; "

-  pkg_cmd << "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' >/etc/apt/sources.list.d/lxc-docker.list; "

-  pkg_cmd << "apt-get update -qq; apt-get install -q -y lxc-docker"

-  if ARGV.include?("--provider=aws".downcase)

-    # Add AUFS dependency to amazon's VM

-    pkg_cmd << "; apt-get install linux-image-extra-3.2.0-40-virtual"

+

+  # Provision docker and new kernel if deployment was not done

+  if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?

+    # Add lxc-docker package

+    pkg_cmd = "apt-get update -qq; apt-get install -q -y python-software-properties; " \

+      "add-apt-repository -y ppa:dotcloud/lxc-docker; apt-get update -qq; " \

+      "apt-get install -q -y lxc-docker; "

+    # Add X.org Ubuntu backported 3.8 kernel

+    pkg_cmd << "add-apt-repository -y ppa:ubuntu-x-swat/r-lts-backport; " \

+      "apt-get update -qq; apt-get install -q -y linux-image-3.8.0-19-generic; "

+    # Add guest additions if local vbox VM

+    is_vbox = true

+    ARGV.each do |arg| is_vbox &&= !arg.downcase.start_with?("--provider") end

+    if is_vbox

+      pkg_cmd << "apt-get install -q -y linux-headers-3.8.0-19-generic dkms; " \

+        "echo 'Downloading VBox Guest Additions...'; " \

+        "wget -q http://dlc.sun.com.edgesuite.net/virtualbox/4.2.12/VBoxGuestAdditions_4.2.12.iso; "

+      # Prepare the VM to add guest additions after reboot

+      pkg_cmd << "echo -e 'mount -o loop,ro /home/vagrant/VBoxGuestAdditions_4.2.12.iso /mnt\n" \

+        "echo yes | /mnt/VBoxLinuxAdditions.run\numount /mnt\n" \

+          "rm /root/guest_additions.sh; ' > /root/guest_additions.sh; " \

+        "chmod 700 /root/guest_additions.sh; " \

+        "sed -i -E 's#^exit 0#[ -x /root/guest_additions.sh ] \\&\\& /root/guest_additions.sh#' /etc/rc.local; " \

+        "echo 'Installation of VBox Guest Additions is proceeding in the background.'; " \

+        "echo '\"vagrant reload\" can be used in about 2 minutes to activate the new guest additions.'; "

+    end

+    # Activate new kernel

+    pkg_cmd << "shutdown -r +1; "

+    config.vm.provision :shell, :inline => pkg_cmd

   end

-  config.vm.provision :shell, :inline => pkg_cmd

 end

+

 # Providers were added on Vagrant >= 1.1.0

 Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

   config.vm.provider :aws do |aws, override|

-    config.vm.box = "dummy"

-    config.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"

     aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]

     aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]

     aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]

@@ -36,8 +55,6 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

   end

   config.vm.provider :rackspace do |rs|

-    config.vm.box = "dummy"

-    config.vm.box_url = "https://github.com/mitchellh/vagrant-rackspace/raw/master/dummy.box"

     config.ssh.private_key_path = ENV["RS_PRIVATE_KEY"]

     rs.username = ENV["RS_USERNAME"]

     rs.api_key  = ENV["RS_API_KEY"]