Skip to content

Commit

Permalink
Require Chef 12.14+ and remove apt/yum dep
Browse files Browse the repository at this point in the history
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 <tsmith@chef.io>
  • Loading branch information
tas50 authored and majormoses committed May 4, 2018
1 parent 08e3f8d commit acec4ed
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 1 addition & 7 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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'
2 changes: 1 addition & 1 deletion recipes/_enterprise_repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion recipes/_linux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down

0 comments on commit acec4ed

Please sign in to comment.