Fix gempath for dev vms and consolidate provisioning with puppet

development/Vagrantfile

@@ -86,9 +86,6 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  config.vm.provision :shell, :inline => 'sudo apt-get update'
-  config.vm.provision :shell, :path   => 'shell-provisioning/upgrade-kernel'
-
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = "."
     puppet.manifest_file  = "site.pp"

development/shell-provisioning/upgrade-kernel

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-
-if [[ `uname -r` != "3.5.0-17-generic" ]]; 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 linux-image-3.5.0-28-generic linux-headers-3.5.0-28-generic -y
-sudo apt-get upgrade -y
-sudo apt-get autoremove -y

development/site.pp

@@ -51,6 +51,12 @@ package {
   ;
 }
 
+# Upgrade kernel if needed
+package {
+  [ 'linux-image-generic', 'linux-headers-generic' ]:
+    ensure => 'latest'
+}
+
 # Make sure we can create and boot nested containers
 if $hostname == 'vbox' {
   package { 'apparmor-utils': }
@@ -81,7 +87,7 @@ gem: --no-ri --no-rdoc
 gemhome: /home/vagrant/gems
 gempath:
 - /home/vagrant/gems
-- /usr/local/lib/ruby/gems/1.8
+- /var/lib/gems/1.9.1
 '
 }
 exec {