From 37c1db3b03aab8f18011871b0237305d0eedd529 Mon Sep 17 00:00:00 2001 From: whitestar Date: Mon, 16 Jul 2018 14:24:54 +0900 Subject: [PATCH] add RHEL family support. --- cookbooks/kata-containers/CHANGELOG.md | 4 ++++ cookbooks/kata-containers/README.md | 1 + cookbooks/kata-containers/metadata.rb | 6 +++--- cookbooks/kata-containers/recipes/default.rb | 29 +++++++++++++++++++++++++++- cookbooks/kata-containers/version | 2 +- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/cookbooks/kata-containers/CHANGELOG.md b/cookbooks/kata-containers/CHANGELOG.md index ae98de3..cb4cc99 100644 --- a/cookbooks/kata-containers/CHANGELOG.md +++ b/cookbooks/kata-containers/CHANGELOG.md @@ -1,5 +1,9 @@ # kata-containers CHANGELOG +0.2.0 +----- +- add RHEL family support. + 0.1.0 ----- - Initial release of kata-containers diff --git a/cookbooks/kata-containers/README.md b/cookbooks/kata-containers/README.md index ba5c400..ec3c61a 100644 --- a/cookbooks/kata-containers/README.md +++ b/cookbooks/kata-containers/README.md @@ -19,6 +19,7 @@ This cookbook installs Kata Containers. ### platforms +- CentOS, RHEL >= 7 - Ubuntu >= 16.04 ### packages diff --git a/cookbooks/kata-containers/metadata.rb b/cookbooks/kata-containers/metadata.rb index 10206c0..92b51ce 100644 --- a/cookbooks/kata-containers/metadata.rb +++ b/cookbooks/kata-containers/metadata.rb @@ -9,7 +9,7 @@ source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git' issues_url 'https://osdn.jp/projects/metasearch/ticket' chef_version '>= 12' -# %w( centos redhat ).each do |os| -# supports os, '>= 7.0' -# end +%w( centos redhat ).each do |os| + supports os, '>= 7.0' +end supports 'ubuntu', '>= 16.04' diff --git a/cookbooks/kata-containers/recipes/default.rb b/cookbooks/kata-containers/recipes/default.rb index 9449d57..6439de0 100644 --- a/cookbooks/kata-containers/recipes/default.rb +++ b/cookbooks/kata-containers/recipes/default.rb @@ -20,7 +20,34 @@ platform = node['platform'] case platform -# when 'centos' +when 'centos', 'redhat' + [ + 'yum-utils', + ].each {|pkg_name| + resources(package: pkg_name) rescue package pkg_name do + action :install + end + } + + bash 'add_kata-containers_repo' do + code <<-"EOH" + source /etc/os-release + yum-config-manager --add-repo "http://download.opensuse.org/repositories/home:/katacontainers:/release/CentOS_${VERSION_ID}/home:katacontainers:release.repo" + EOH + action :nothing + not_if "yum repolist | grep 'katacontainers'" + end + + [ + 'kata-runtime', + 'kata-proxy', + 'kata-shim', + ].each {|pkg_name| + resources(package: pkg_name) rescue package pkg_name do + action :install + notifies :run, 'bash[add_kata-containers_repo]', :before + end + } when 'ubuntu' apt_get_update = 'apt-get_update' resources(execute: apt_get_update) rescue execute apt_get_update do diff --git a/cookbooks/kata-containers/version b/cookbooks/kata-containers/version index 6e8bf73..0ea3a94 100644 --- a/cookbooks/kata-containers/version +++ b/cookbooks/kata-containers/version @@ -1 +1 @@ -0.1.0 +0.2.0 -- 2.11.0