From 94baf2c5b9b2eb49b554d933f9997da072905d88 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Tue, 12 Mar 2013 12:05:04 -0700 Subject: [PATCH] upgraded kernel to 3.5.0-25 to fix a kernel bug --- Vagrantfile | 4 ++-- puppet/modules/docker/manifests/init.pp | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index dcc3e50bdb..c823a39581 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,11 +7,11 @@ Vagrant::Config.run do |config| # please see the online documentation at vagrantup.com. # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "quantal64" + config.vm.box = "quantal64_3.5.0-25" # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. - config.vm.box_url = "http://unworkable.org/~niallo/quantal64.box" + config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box" # Boot with a GUI so you can see the screen. (Default is headless) # config.vm.boot_mode = :gui diff --git a/puppet/modules/docker/manifests/init.pp b/puppet/modules/docker/manifests/init.pp index ed3dd62b63..38b40a8e39 100644 --- a/puppet/modules/docker/manifests/init.pp +++ b/puppet/modules/docker/manifests/init.pp @@ -7,7 +7,11 @@ class docker { Package { ensure => "installed" } - package { ["lxc", "debootstrap", "wget", "bsdtar", "git"]: } + package { ["lxc", "debootstrap", "wget", "bsdtar", "git", + "linux-image-3.5.0-25-generic", + "linux-image-extra-3.5.0-25-generic", + "virtualbox-guest-utils", + "linux-headers-3.5.0-25-generic"]: } notify { "docker_url = $docker_url": withpath => true } @@ -50,6 +54,11 @@ class docker { creates => "/usr/local/bin/dockerd" } + exec { "vbox-add" : + require => Package["linux-headers-3.5.0-25-generic"], + command => "/etc/init.d/vboxadd setup", + } + service { "dockerd" : ensure => "running", start => "/sbin/initctl start dockerd",