Update upstream cookbooks

2017-03-20 13:19:10 +00:00
parent bfd2d52ea8
commit bcfd44b923
340 changed files with 12576 additions and 5465 deletions
--- a/cookbooks/yum-epel/CHANGELOG.md
+++ b/cookbooks/yum-epel/CHANGELOG.md
@@ -1,18 +1,34 @@
-yum-epel Cookbook CHANGELOG
-======================
+# yum-epel Cookbook CHANGELOG
+
 This file is used to list changes made in each version of the yum-epel cookbook.

-v0.6.5 (2015-11-23)
-------------------
+## v0.7.1 (2016-08-19)
+- Remove bats testing
+- Fix attribute settings 
+- Cleanup travis file
+
+## v0.7.0 (2016-04-27)
+
+- Added support for IBM zlinux platform
+- Added back the Test Kitchen support for local vagrant testing
+- Added long_description to the metadata
+- Loosen the dependency on the yum cookbook
+
+## v0.6.5
+
+- updated to use `make_cache` option that yum cookbook allows for the yum resource to use.
+
+## v0.6.5 (2015-11-23)
+
 - Fix setting bool false properties

-v0.6.4 (2015-10-27)
-------------------
- Updating default recipe for Chef 13 deprecation warnings. Not
-  passing nil.
+## v0.6.4 (2015-10-27)
+
+- Updating default recipe for Chef 13 deprecation warnings. Not
+- passing nil.
+
+## v0.6.3 (2015-09-22)

-v0.6.3 (2015-09-22)
-------------------
 - Added standard Chef gitignore and chefignore files
 - Added the standard chef rubocop config
 - Update contributing, maintainers, and testing docs
@@ -23,66 +39,66 @@ v0.6.3 (2015-09-22)
 - Add additional distros to the metadata
 - Added source_url and issues_url metadata

-v0.6.2 (2015-06-21)
-------------------
+## v0.6.2 (2015-06-21)
+
 - Depending on yum ~> 3.2
 - Support for the password attribute wasn't added to the
-  yum_repository LWRP until yum 3.2.0.  
+- yum_repository LWRP until yum 3.2.0.
+
+## v0.6.1 (2015-06-21)

-v0.6.1 (2015-06-21)
-------------------
 - Switching to https for URL links
 - Using metalink URLs

-v0.6.0 (2015-01-03)
-------------------
+## v0.6.0 (2015-01-03)
+
 - Adding EL7 support

-v0.5.3 (2014-10-28)
-------------------
+## v0.5.3 (2014-10-28)
+
 - Revert Use HTTPS for GPG keys and mirror lists

-v0.5.2 (2014-10-28)
-------------------
+## v0.5.2 (2014-10-28)
+
 - Use HTTPS for GPG keys and mirror lists
 - Use local key on Amazon Linux

-v0.5.0 (2014-09-02)
-------------------
+## v0.5.0 (2014-09-02)
+
 - Add all attribute available to LWRP to allow for tuning.

-v0.4.0 (2014-07-27)
-------------------
+## v0.4.0 (2014-07-27)
+
 - [#9] Allowing list of repositories to reference configurable.

-v0.3.6 (2014-04-09)
-------------------
+## v0.3.6 (2014-04-09)
+
 - [COOK-4509] add RHEL7 support to yum-epel cookbook

-v0.3.4 (2014-02-19)
-------------------
+## v0.3.4 (2014-02-19)
+
 COOK-4353 - Fixing typo in readme

-v0.3.2 (2014-02-13)
-------------------
+## v0.3.2 (2014-02-13)
+
 Updating README to explain the 'managed' parameter

-v0.3.0 (2014-02-12)
-------------------
+## v0.3.0 (2014-02-12)
+
 [COOK-4292] - Do not manage secondary repos by default

-v0.2.0
------
+## v0.2.0
+
 Adding Amazon Linux support

-v0.1.6
------
+## v0.1.6
+
 Fixing up attribute values for EL6

-v0.1.4
------
+## v0.1.4
+
 Adding CHANGELOG.md

-v0.1.0
------
+## v0.1.0
+
 initial release
--- a/cookbooks/yum-epel/README.md
+++ b/cookbooks/yum-epel/README.md
@@ -1,35 +1,28 @@
-yum-epel Cookbook
-============
-[![Build Status](https://travis-ci.org/chef-cookbooks/yum-epel.svg?branch=master)](http://travis-ci.org/chef-cookbooks/yum-epel)
-[![Cookbook Version](https://img.shields.io/cookbook/v/yum-epel.svg)](https://supermarket.chef.io/cookbooks/yum-epel)
+# yum-epel Cookbook
+[![Build Status](https://travis-ci.org/chef-cookbooks/yum-epel.svg?branch=master)](http://travis-ci.org/chef-cookbooks/yum-epel) [![Cookbook Version](https://img.shields.io/cookbook/v/yum-epel.svg)](https://supermarket.chef.io/cookbooks/yum-epel)

-The yum-epel cookbook takes over management of the default
-repositoryids shipped with epel-release. It allows attribute
-manipulation of `epel`, `epel-debuginfo`, `epel-source`, `epel-testing`,
-`epel-testing-debuginfo`, and `epel-testing-source`.
+Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group that creates, maintains, and manages a high quality set of additional packages for Enterprise Linux, including, but not limited to, Red Hat Enterprise Linux (RHEL), CentOS and Scientific Linux (SL), Oracle Linux (OL).

-Requirements
------------
-#### Platforms
-* RHEL/CentOS and derivatives
-* Fedora
+The yum-epel cookbook takes over management of the default repositoryids shipped with epel-release. It allows attribute manipulation of `epel`, `epel-debuginfo`, `epel-source`, `epel-testing`, `epel-testing-debuginfo`, and `epel-testing-source`.

-#### Chef
-* Chef 11+
+## Requirements
+### Platforms
+- RHEL/CentOS and derivatives

-#### Cookbooks
-* yum version 3.2.0 or higher
+### Chef
+- Chef 11+

+### Cookbooks
+- yum version 3.6.3 or higher

-Attributes
----------
+## Attributes
 The following attributes are set by default

-``` ruby
+```ruby
 default['yum-epel']['repositories'] = %w{epel epel-debuginfo epel-source epel-testing epel-testing-debuginfo epel-testing-source}
 ```

-``` ruby
+```ruby
 default['yum']['epel']['repositoryid'] = 'epel'
 default['yum']['epel']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
 default['yum']['epel']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch'
@@ -40,7 +33,7 @@ default['yum']['epel']['enabled'] = true
 default['yum']['epel']['managed'] = true
 ```

-``` ruby
+```ruby
 default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo'
 default['yum']['epel-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch - Debug'
 default['yum']['epel-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch'
@@ -51,7 +44,7 @@ default['yum']['epel-debuginfo']['enabled'] = false
 default['yum']['epel-debuginfo']['managed'] = false
 ```

-``` ruby
+```ruby
 default['yum']['epel-source']['repositoryid'] = 'epel-source'
 default['yum']['epel-source']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch - Source'
 default['yum']['epel-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch'
@@ -62,7 +55,7 @@ default['yum']['epel-source']['enabled'] = false
 default['yum']['epel-source']['managed'] = false
 ```

-``` ruby
+```ruby
 default['yum']['epel-testing']['repositoryid'] = 'epel-testing'
 default['yum']['epel-testing']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch'
 default['yum']['epel-testing']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-epel6&arch=$basearch'
@@ -73,7 +66,7 @@ default['yum']['epel-testing']['enabled'] = false
 default['yum']['epel-testing']['managed'] = false
 ```

-``` ruby
+```ruby
 default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo'
 default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch Debug'
 default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel6&arch=$basearch'
@@ -84,7 +77,7 @@ default['yum']['epel-testing-debuginfo']['enabled'] = false
 default['yum']['epel-testing-debuginfo']['managed'] = false
 ```

-``` ruby
+```ruby
 default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source'
 default['yum']['epel-testing-source']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch Source'
 default['yum']['epel-testing-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel6&arch=$basearch'
@@ -95,11 +88,10 @@ default['yum']['epel-testing-source']['enabled'] = false
 default['yum']['epel-testing-source']['managed'] = false
 ```

-Recipes
-------
-* default - Walks through node attributes and feeds a yum_resource
-  parameters. The following is an example a resource generated by the
-  recipe during compilation.
+## Recipes
+- default - Walks through node attributes and feeds a yum_resource
+- parameters. The following is an example a resource generated by the
+- recipe during compilation.

 ```ruby
  yum_repository 'epel' do
@@ -111,8 +103,7 @@ Recipes
  end
 ```

-Usage Example
-------------
+## Usage Example
 To disable the epel repository through a Role or Environment definition

 ```
@@ -127,22 +118,18 @@ default_attributes(
 )
 ```

-Uncommonly used repositoryids are not managed by default. This is
-speeds up integration testing pipelines by avoiding yum-cache builds
-that nobody cares about. To enable the epel-testing repository with a
-wrapper cookbook, place the following in a recipe:
+Uncommonly used repositoryids are not managed by default. This is speeds up integration testing pipelines by avoiding yum-cache builds that nobody cares about. To enable the epel-testing repository with a wrapper cookbook, place the following in a recipe:

-```
+```ruby
 node.default['yum']['epel-testing']['enabled'] = true
 node.default['yum']['epel-testing']['managed'] = true
 include_recipe 'yum-epel'
 ```

-More Examples
-------------
+## More Examples
 Point the epel repositories at an internally hosted server.

-```
+```ruby
 node.default['yum']['epel']['enabled'] = true
 node.default['yum']['epel']['mirrorlist'] = nil
 node.default['yum']['epel']['baseurl'] = 'https://internal.example.com/centos/6/os/x86_64'
@@ -151,12 +138,11 @@ node.default['yum']['epel']['sslverify'] = false
 include_recipe 'yum-epel'
 ```

-License & Authors
-----------------
+## License & Authors
+**Author:** Cookbook Engineering Team ([cookbooks@chef.io](mailto:cookbooks@chef.io))

-**Author:** Cookbook Engineering Team (<cookbooks@chef.io>)
+**Copyright:** 2011-2016, Chef Software, Inc.

-**Copyright:** 2011-2015, Chef Software, Inc.
 ```
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/cookbooks/yum-epel/attributes/epel-debuginfo.rb
+++ b/cookbooks/yum-epel/attributes/epel-debuginfo.rb
@@ -1,28 +1,15 @@
 default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo'
+default['yum']['epel-debuginfo']['description'] = 'Extra Packages for $releasever - $basearch - Debug'

-case node['platform']
-when 'amazon'
-  default['yum']['epel-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
+if node['platform'] == 'amazon'
+  default['yum']['epel-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch'
  default['yum']['epel-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 5 - $basearch - Debug'
-    default['yum']['epel-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=$basearch'
-    default['yum']['epel-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch - Debug'
-    default['yum']['epel-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch'
-    default['yum']['epel-debuginfo']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 7 - $basearch - Debug'
-    default['yum']['epel-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch'
-    default['yum']['epel-debuginfo']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-  end
+  default['yum']['epel-debuginfo']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-debuginfo']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
 end
-
 default['yum']['epel-debuginfo']['failovermethod'] = 'priority'
 default['yum']['epel-debuginfo']['gpgcheck'] = true
 default['yum']['epel-debuginfo']['enabled'] = false
 default['yum']['epel-debuginfo']['managed'] = false
+default['yum']['epel-debuginfo']['make_cache'] = true
--- a/cookbooks/yum-epel/attributes/epel-source.rb
+++ b/cookbooks/yum-epel/attributes/epel-source.rb
@@ -1,28 +1,15 @@
 default['yum']['epel-source']['repositoryid'] = 'epel-source'
-
-case node['platform']
-when 'amazon'
-  default['yum']['epel-source']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
+default['yum']['epel-source']['description'] = 'Extra Packages for $releasever - $basearch - Source'
+if node['platform'] == 'amazon'
+  default['yum']['epel-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch'
  default['yum']['epel-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel-source']['description'] = 'Extra Packages for Enterprise Linux 5 - $basearch - Source'
-    default['yum']['epel-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-5&arch=$basearch'
-    default['yum']['epel-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel-source']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch - Source'
-    default['yum']['epel-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch'
-    default['yum']['epel-source']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel-source']['description'] = 'Extra Packages for Enterprise Linux 7 - $basearch - Source'
-    default['yum']['epel-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch'
-    default['yum']['epel-source']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-  end
+  default['yum']['epel-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
 end

 default['yum']['epel-source']['failovermethod'] = 'priority'
 default['yum']['epel-source']['gpgcheck'] = true
 default['yum']['epel-source']['enabled'] = false
 default['yum']['epel-source']['managed'] = false
+default['yum']['epel-source']['make_cache'] = true
--- a/cookbooks/yum-epel/attributes/epel-testing-debuginfo.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing-debuginfo.rb
@@ -1,28 +1,15 @@
 default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo'
-
-case node['platform']
-when 'amazon'
-  default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
+default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for $releasever - $basearch - Testing Debug'
+if node['platform'] == 'amazon'
+  default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel6&arch=$basearch'
  default['yum']['epel-testing-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 5 - Testing - $basearch Debug'
-    default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel5&arch=$basearch'
-    default['yum']['epel-testing-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch Debug'
-    default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel6&arch=$basearch'
-    default['yum']['epel-testing-debuginfo']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for Enterprise Linux 7 - Testing - $basearch Debug'
-    default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch'
-    default['yum']['epel-testing-debuginfo']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-  end
+  default['yum']['epel-testing-debuginfo']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-testing-debuginfo']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
 end

 default['yum']['epel-testing-debuginfo']['failovermethod'] = 'priority'
 default['yum']['epel-testing-debuginfo']['gpgcheck'] = true
 default['yum']['epel-testing-debuginfo']['enabled'] = false
 default['yum']['epel-testing-debuginfo']['managed'] = false
+default['yum']['epel-testing-debuginfo']['make_cache'] = true
--- a/cookbooks/yum-epel/attributes/epel-testing-source.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing-source.rb
@@ -1,28 +1,14 @@
 default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source'
-
-case node['platform']
-when 'amazon'
-  default['yum']['epel-testing-source']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
+default['yum']['epel-testing-source']['description'] = 'Extra Packages for $releasever - $basearch - Testing Source'
+if node['platform'] == 'amazon'
+  default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel6&arch=$basearch'
  default['yum']['epel-testing-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel-testing-source']['description'] = 'Extra Packages for Enterprise Linux 5 - Testing - $basearch Source'
-    default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel5&arch=$basearch'
-    default['yum']['epel-testing-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel-testing-source']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch Source'
-    default['yum']['epel-testing-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel6&arch=$basearch'
-    default['yum']['epel-testing-source']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel-testing-source']['description'] = 'Extra Packages for Enterprise Linux 7 - Testing - $basearch Source'
-    default['yum']['epel-testing-source']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch'
-    default['yum']['epel-testing-source']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-  end
+  default['yum']['epel-testing-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-testing-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
 end
-
 default['yum']['epel-testing-source']['failovermethod'] = 'priority'
 default['yum']['epel-testing-source']['gpgcheck'] = true
 default['yum']['epel-testing-source']['enabled'] = false
 default['yum']['epel-testing-source']['managed'] = false
+default['yum']['epel-testing-source']['make_cache'] = true
--- a/cookbooks/yum-epel/attributes/epel-testing.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing.rb
@@ -1,28 +1,15 @@
 default['yum']['epel-testing']['repositoryid'] = 'epel-testing'
-
-case node['platform']
-when 'amazon'
-  default['yum']['epel-testing']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel-testing']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
-  default['yum']['epel-testing']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
+default['yum']['epel-testing']['description'] = 'Extra Packages for $releasever - $basearch - Testing '
+if node['platform'] == 'amazon'
+  default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=$basearch'
+  default['yum']['epel-testing-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel-testing']['description'] = 'Extra Packages for Enterprise Linux 5 - Testing - $basearch'
-    default['yum']['epel-testing']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=$basearch'
-    default['yum']['epel-testing']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel-testing']['description'] = 'Extra Packages for Enterprise Linux 6 - Testing - $basearch'
-    default['yum']['epel-testing']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-epel6&arch=$basearch'
-    default['yum']['epel-testing']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel-testing']['description'] = 'Extra Packages for Enterprise Linux 7 - Testing - $basearch'
-    default['yum']['epel-testing']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch'
-    default['yum']['epel-testing']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
-  end
+  default['yum']['epel-testing-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-testing-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
 end

 default['yum']['epel-testing']['failovermethod'] = 'priority'
 default['yum']['epel-testing']['gpgcheck'] = true
 default['yum']['epel-testing']['enabled'] = false
 default['yum']['epel-testing']['managed'] = false
+default['yum']['epel-testing']['make_cache'] = true
--- a/cookbooks/yum-epel/attributes/epel.rb
+++ b/cookbooks/yum-epel/attributes/epel.rb
@@ -1,24 +1,17 @@
 default['yum']['epel']['repositoryid'] = 'epel'
+default['yum']['epel']['description'] = 'Extra Packages for $releasever - $basearch'

-case node['platform']
-when 'amazon'
-  default['yum']['epel']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-  default['yum']['epel']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
-  default['yum']['epel']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
+case node['kernel']['machine']
+when 's390x'
+  default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/'
+  default['yum']['epel']['gpgkey'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release'
 else
-  case node['platform_version'].to_i
-  when 5
-    default['yum']['epel']['description'] = 'Extra Packages for Enterprise Linux 5 - $basearch'
-    default['yum']['epel']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch'
-    default['yum']['epel']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
-  when 6
-    default['yum']['epel']['description'] = 'Extra Packages for Enterprise Linux 6 - $basearch'
-    default['yum']['epel']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch'
-    default['yum']['epel']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-  when 7
-    default['yum']['epel']['description'] = 'Extra Packages for Enterprise Linux 7 - $basearch'
-    default['yum']['epel']['mirrorlist'] = 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
-    default['yum']['epel']['gpgkey'] = 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7'
+  if node['platform'] == 'amazon'
+    default['yum']['epel']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
+    default['yum']['epel']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
+  else
+    default['yum']['epel']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch"
+    default['yum']['epel']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
  end
 end

@@ -26,3 +19,4 @@ default['yum']['epel']['failovermethod'] = 'priority'
 default['yum']['epel']['gpgcheck'] = true
 default['yum']['epel']['enabled'] = true
 default['yum']['epel']['managed'] = true
+default['yum']['epel']['make_cache'] = true
--- a/cookbooks/yum-epel/metadata.json
+++ b/cookbooks/yum-epel/metadata.json
--- a/cookbooks/yum-epel/recipes/default.rb
+++ b/cookbooks/yum-epel/recipes/default.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: yum-epel
 # Recipe:: default
 #
-# Copyright 2013-2015, Chef Software, Inc.
+# Copyright 2013-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ node['yum-epel']['repositories'].each do |repo|
    include_config node['yum'][repo]['include_config'] unless node['yum'][repo]['include_config'].nil?
    includepkgs node['yum'][repo]['includepkgs'] unless node['yum'][repo]['includepkgs'].nil?
    keepalive node['yum'][repo]['keepalive'] unless node['yum'][repo]['keepalive'].nil?
+    make_cache node['yum'][repo]['make_cache'] unless node['yum'][repo]['make_cache'].nil?
    max_retries node['yum'][repo]['max_retries'] unless node['yum'][repo]['max_retries'].nil?
    metadata_expire node['yum'][repo]['metadata_expire'] unless node['yum'][repo]['metadata_expire'].nil?
    mirror_expire node['yum'][repo]['mirror_expire'] unless node['yum'][repo]['mirror_expire'].nil?