From a55d65be11e0e09a9de178975a9f3df63f1054c8 Mon Sep 17 00:00:00 2001 From: John Bellone Date: Sun, 7 Feb 2016 11:44:03 -0500 Subject: [PATCH] Fix test kitchen builds for CentOS 5. --- README.md | 5 +++-- metadata.rb | 1 + recipes/default.rb | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3899c355..7ae84753 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,10 @@ for more advanced configuration. Out of the box the following platforms are certified to work and are tested using our [Test Kitchen][8] configuration. Additional platforms _may_ work, but your mileage may vary. -- CentOS (RHEL) 6.6, 7.1 + +- CentOS (RHEL) 5.11, 6.7, 7.2 - Ubuntu 12.04, 14.04 -- Windows +- Windows 2012 ### Client Out of the box the default recipe installs and configures the Consul diff --git a/metadata.rb b/metadata.rb index 30f90594..3e394855 100644 --- a/metadata.rb +++ b/metadata.rb @@ -21,6 +21,7 @@ depends 'libartifact', '~> 1.3' depends 'poise', '~> 2.2' depends 'poise-service', '~> 1.0' +depends 'yum-epel' source_url 'https://github.com/johnbellone/consul-cookbook' if respond_to?(:source_url) issues_url 'https://github.com/johnbellone/consul-cookbook/issues' if respond_to?(:issues_url) diff --git a/recipes/default.rb b/recipes/default.rb index 87a8c9af..827d7f0d 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -4,6 +4,9 @@ # # Copyright 2014-2016, Bloomberg Finance L.P. # +if platform_family?('rhel') + include_recipe 'yum-epel::default' if node['platform_version'].to_i == 5 +end node.default['nssm']['install_location'] = '%WINDIR%'