From acec4ede37201d39b027c658679a743cca00179e Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sat, 28 Apr 2018 16:53:12 -0700 Subject: [PATCH] Require Chef 12.14+ and remove apt/yum dep Remove the legacy apt and yum dependencies by requiring Chef 12.14 which came out Sept 2016. Chef 12 is technically end of life, and it seems reasonable to require people to at least be on one of the later releases. Signed-off-by: Tim Smith --- README.md | 4 +--- metadata.rb | 8 +------- recipes/_enterprise_repo.rb | 2 +- recipes/_linux.rb | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f79210ee..b24ae2d5 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,10 @@ See CODE_OF_CONDUCT.md, CONTRIBUTING.md and TESTING.md documents. ### Chef -* Chef 12+ +* Chef 12.14+ ### Cookbooks -* [APT](https://supermarket.chef.io/cookbooks/apt) -* [YUM](https://supermarket.chef.io/cookbooks/yum) * [Windows](https://supermarket.chef.io/cookbooks/windows) * [RabbitMQ](https://supermarket.chef.io/cookbooks/rabbitmq) * [RedisIO](https://supermarket.chef.io/cookbooks/redisio) diff --git a/metadata.rb b/metadata.rb index 2ab5387b..30de8c15 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,12 +6,6 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "4.4.0" -# available @ https://supermarket.chef.io/cookbooks/apt -depends "apt", ">= 2.0" - -# available @ https://supermarket.chef.io/cookbooks/yum -depends "yum", ">= 3.0" - # available @ https://supermarket.chef.io/cookbooks/windows depends "windows", ">= 1.36" @@ -48,4 +42,4 @@ source_url 'https://github.com/sensu/sensu-chef' issues_url 'https://github.com/sensu/sensu-chef/issues' -chef_version '>= 12.0' +chef_version '>= 12.14' diff --git a/recipes/_enterprise_repo.rb b/recipes/_enterprise_repo.rb index 61423b1f..d3878c33 100644 --- a/recipes/_enterprise_repo.rb +++ b/recipes/_enterprise_repo.rb @@ -21,7 +21,7 @@ case node["platform_family"] when "debian" - include_recipe "apt" + package "apt-transport-https" apt_repository "sensu-enterprise" do uri File.join(repository_url, "apt") diff --git a/recipes/_linux.rb b/recipes/_linux.rb index bf1a73dc..27cde039 100644 --- a/recipes/_linux.rb +++ b/recipes/_linux.rb @@ -21,7 +21,7 @@ case platform_family when "debian" - include_recipe "apt" + package "apt-transport-https" apt_repository "sensu" do uri node["sensu"]['apt_repo_url']