Skip to content

Commit a09cb3e

Browse files
authored
Merge pull request #351 from caskdata/feature/COOK-130-drop-old-centos
COOK-130 Drop support for RHEL 5 and derivatives
2 parents 83c6266 + ba562e1 commit a09cb3e

File tree

3 files changed

+13
-22
lines changed

3 files changed

+13
-22
lines changed

metadata.json

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"maintainer_email": "[email protected]",
77
"license": "Apache-2.0",
88
"platforms": {
9+
"centos": ">= 6.0",
10+
"redhat": ">= 6.0",
11+
"scientific": ">= 6.0",
912
"amazon": ">= 0.0.0",
10-
"centos": ">= 0.0.0",
1113
"debian": ">= 0.0.0",
12-
"redhat": ">= 0.0.0",
13-
"scientific": ">= 0.0.0",
1414
"ubuntu": ">= 0.0.0"
1515
},
1616
"dependencies": {
@@ -20,27 +20,12 @@
2020
"selinux": ">= 0.0.0",
2121
"sysctl": ">= 0.0.0",
2222
"ulimit": ">= 0.0.0"
23-
},
24-
"recommendations": {
25-
26-
},
27-
"suggestions": {
28-
29-
},
30-
"conflicting": {
31-
3223
},
3324
"providing": {
3425

35-
},
36-
"replacing": {
37-
3826
},
3927
"attributes": {
4028

41-
},
42-
"groupings": {
43-
4429
},
4530
"recipes": {
4631

metadata.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@
1313
depends cb
1414
end
1515

16+
# RHEL-like distributions
1617
%w(
17-
amazon
1818
centos
19-
debian
2019
redhat
2120
scientific
21+
).each do |os|
22+
supports os, '>= 6.0'
23+
end
24+
25+
%w(
26+
amazon
27+
debian
2228
ubuntu
2329
).each do |os|
2430
supports os

recipes/repo.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Cookbook:: hadoop
33
# Recipe:: repo
44
#
5-
# Copyright © 2013-2016 Cask Data, Inc.
5+
# Copyright © 2013-2017 Cask Data, Inc.
66
#
77
# Licensed under the Apache License, Version 2.0 (the "License");
88
# you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@
8787
case node['platform_family']
8888
when 'rhel', 'amazon'
8989
yum_base_url = 'http://public-repo-1.hortonworks.com/HDP'
90-
os = if major_platform_version == 5 || hdp_update_version.to_f >= 2.3
90+
os = if hdp_update_version.to_f >= 2.3
9191
"centos#{major_platform_version}"
9292
else
9393
'centos6'

0 commit comments

Comments
 (0)