From cd53ad2efdf8ef50aa134551f62f3daf66b1496e Mon Sep 17 00:00:00 2001
From: Fabio Rehm <fgrehm@gmail.com>
Date: Sat, 28 Sep 2013 01:33:24 -0300
Subject: [PATCH] Fix gempath for dev vms and consolidate provisioning with
 puppet

---
 development/Vagrantfile                       |  3 ---
 development/shell-provisioning/upgrade-kernel | 14 --------------
 development/site.pp                           |  8 +++++++-
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100755 development/shell-provisioning/upgrade-kernel

diff --git a/development/Vagrantfile b/development/Vagrantfile
index 6d0e143..3a72826 100644
--- a/development/Vagrantfile
+++ b/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"
diff --git a/development/shell-provisioning/upgrade-kernel b/development/shell-provisioning/upgrade-kernel
deleted file mode 100755
index 2019b17..0000000
--- a/development/shell-provisioning/upgrade-kernel
+++ /dev/null
@@ -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
diff --git a/development/site.pp b/development/site.pp
index 4c80595..00c7b41 100644
--- a/development/site.pp
+++ b/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 {