From: whitestar <whitestar@gaea.test>
Date: Tue, 7 Feb 2017 13:36:20 +0000 (+0900)
Subject: Bug fix: linux-image installation in a Linux container.
X-Git-Tag: kubernetes-grid-0.1.2^0
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96f1e7e532dd2202f4e72bcfe8644c43b4fe3bda;p=metasearch%2Fgrid-chef-repo.git

Bug fix: linux-image installation in a Linux container.
---

diff --git a/cookbooks/kubernetes-grid/CHANGELOG.md b/cookbooks/kubernetes-grid/CHANGELOG.md
index f3d3ded..e25de8c 100644
--- a/cookbooks/kubernetes-grid/CHANGELOG.md
+++ b/cookbooks/kubernetes-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # kubernetes-grid CHANGELOG
 
+0.1.2
+-----
+- Bug fix: linux-image installation in a Linux container.
+
 0.1.1
 -----
 - adds the `kubernetes-grid::gp-node` recipe.
diff --git a/cookbooks/kubernetes-grid/metadata.rb b/cookbooks/kubernetes-grid/metadata.rb
index d7817a2..2474cf6 100644
--- a/cookbooks/kubernetes-grid/metadata.rb
+++ b/cookbooks/kubernetes-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures Kubernetes'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.1'
+version          '0.1.2'
 
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
diff --git a/cookbooks/kubernetes-grid/recipes/node-commons.rb b/cookbooks/kubernetes-grid/recipes/node-commons.rb
index 51f57a1..d8b3137 100644
--- a/cookbooks/kubernetes-grid/recipes/node-commons.rb
+++ b/cookbooks/kubernetes-grid/recipes/node-commons.rb
@@ -68,6 +68,8 @@ when 'debian'
     kern_pkg = "linux-image-#{node['kernel']['release']}"
     resources(package: kern_pkg) rescue package kern_pkg do
       action :install
+      # Unless the platform version of host and guest is same, this resource will fail.
+      ignore_failure true
     end
   end