Merge pull request #340 from caskdata/feature/sysctl-compat

compatibility fix for sysctl 0.10, which removed default attributes

Berksfile

@@ -9,6 +9,7 @@ if Chef::VERSION.to_f < 12.0
   cookbook 'mingw', '< 1.0'
   cookbook 'ohai', '< 4.0'
   cookbook 'selinux', '< 1.0'
+  cookbook 'sysctl', '< 0.10'
   cookbook 'windows', '< 2.0'
   cookbook 'yum', '< 4.0'
   cookbook 'yum-epel', '< 2.0'
@@ -19,6 +20,7 @@ elsif Chef::VERSION.to_f < 12.5
   cookbook 'mingw', '< 2.0'
   cookbook 'ohai', '< 5.0'
   cookbook 'selinux', '< 1.0'
+  cookbook 'sysctl', '< 0.10'
   cookbook 'windows', '< 3.0'
   cookbook 'yum', '< 5.0'
 elsif Chef::VERSION.to_f < 12.6

attributes/zzz_system_tuning.rb

@@ -162,10 +162,9 @@
 ###
 
 ports = ports.uniq.sort.to_s.tr(' ', '').tr('[', '').tr(']', '') # De-dupe, Sort, and Stringify
-include_attribute 'sysctl'
 
 # net.ipv4.ip_local_reserved_ports setting (COOK-79)
-if node['sysctl']['params'].key?('net') && node['sysctl']['params']['net'].key?('ipv4') &&
+if node.key?('sysctl') && node['sysctl'].key?('params') && node['sysctl']['params'].key?('net') && node['sysctl']['params']['net'].key?('ipv4') &&
    node['sysctl']['params']['net']['ipv4'].key?('ip_local_reserved_ports')
   orig = node['sysctl']['params']['net']['ipv4']['ip_local_reserved_ports']
   default['sysctl']['params']['net']['ipv4']['ip_local_reserved_ports'] = "#{orig},#{ports}"

metadata.json

@@ -16,9 +16,9 @@
   "dependencies": {
     "yum": ">= 3.0",
     "apt": ">= 2.1.2",
-    "sysctl": "< 0.10.0",
     "dpkg_autostart": ">= 0.0.0",
     "selinux": ">= 0.0.0",
+    "sysctl": ">= 0.0.0",
     "ulimit": ">= 0.0.0"
   },
   "recommendations": {

metadata.rb

@@ -8,9 +8,8 @@
 
 depends 'yum', '>= 3.0'
 depends 'apt', '>= 2.1.2'
-depends 'sysctl', '< 0.10.0'
 
-%w(dpkg_autostart selinux ulimit).each do |cb|
+%w(dpkg_autostart selinux sysctl ulimit).each do |cb|
   depends cb
 end