Update firewall cookbook

cookbooks/firewall/CHANGELOG.md

@@ -2,6 +2,10 @@ firewall Cookbook CHANGELOG
 =======================
 This file is used to list changes made in each version of the firewall cookbook.
 
+v2.6.3 (2018-02-01)
+-------------------
+* Fix issue with deep merging of hashes and arrays in recent chef release (#185)
+
 v2.6.2 (2017-06-01)
 -------------------
 * Incorrect file checking on Ubuntu, double file write (#173)

cookbooks/firewall/libraries/helpers_iptables.rb

@@ -94,7 +94,7 @@ module FirewallCookbook
       end
 
       def default_ruleset(current_node)
-        current_node['firewall']['iptables']['defaults'][:ruleset]
+        current_node['firewall']['iptables']['defaults'][:ruleset].to_h
       end
 
       def ensure_default_rules_exist(current_node, new_resource)
@@ -104,7 +104,7 @@ module FirewallCookbook
         # hash regardless of ipv6 status
         %w(iptables ip6tables).each do |name|
           input[name] = {} unless input[name]
-          input[name].merge!(default_ruleset(current_node))
+          input[name].merge!(default_ruleset(current_node).to_h)
         end
       end
     end