diff options
| author | Tim Smith <tsmith@chef.io> | 2017-09-15 16:11:08 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2017-09-18 10:10:55 -0700 |
| commit | c8e389309593d52296de814cbc53812e88c90ab4 (patch) | |
| tree | cc51250f98ebbed5be438dc379194bd5af09e17f | |
| parent | 1e39eb1a7258cd431372ef909469fe67cff835a2 (diff) | |
| download | chef-c8e389309593d52296de814cbc53812e88c90ab4.tar.gz | |
Chef 13 recipe updates and simplification
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | kitchen-tests/cookbooks/base/recipes/default.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb index d8dbb9fe41..82b98b6bab 100644 --- a/kitchen-tests/cookbooks/base/recipes/default.rb +++ b/kitchen-tests/cookbooks/base/recipes/default.rb @@ -7,12 +7,12 @@ hostname "chef-travis-ci.chef.io" -if node["platform_family"] == "debian" +if platform_family?("debian") include_recipe "ubuntu" apt_update "packages" end -if %w{rhel fedora}.include?(node["platform_family"]) +if platform_family?("rhel", "fedora", "amazon") include_recipe "selinux::disabled" end @@ -23,7 +23,7 @@ yum_repository "epel" do gpgkey "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" gpgcheck true mirrorlist "https://mirrors.fedoraproject.org/metalink?repo=epel-#{node['platform_version'].to_i}&arch=$basearch" - only_if { node["platform_family"] == "rhel" && node["platform"] != "amazon" } + only_if { platform_family?("rhel") } end include_recipe "build-essential" |