Merge pull request #694 from knackaron/ip6tables-disable

allow ip6tables to be disabled

diff --cc manifests/init.pp
index ba7902153b893ac2b28dc40b282de0a3b1bdb32d,5e824d24eb630dde1f18c8975ae0ef04c6577b36..73b6892efa79d53d6e6e3562306e20efe4345453
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -17,8 -18,9 +18,10 @@@ class firewall 
    $service_name    = $::firewall::params::service_name,
    $service_name_v6 = $::firewall::params::service_name_v6,
    $package_name    = $::firewall::params::package_name,
 +  $ebtables_manage = false,
  ) inherits ::firewall::params {
+   $_ensure_v6 = pick($ensure_v6, $ensure)
+ 
    case $ensure {
      /^(running|stopped)$/: {
        # Do nothing.

diff --cc manifests/linux.pp
index a48cca7e4cb8c35a76a9ce90b45dcdb372f53937,403760b550be6087ccb523e4a42ed7e6d8f915ba..c5228ca66fc2bee9e452f76bb1ca67df92e13399
--- 1/manifests/linux.pp
--- 2/manifests/linux.pp
+++ b/manifests/linux.pp
@@@ -17,13 -23,19 +23,20 @@@ class firewall::linux 
    $service_name    = $::firewall::params::service_name,
    $service_name_v6 = $::firewall::params::service_name_v6,
    $package_name    = $::firewall::params::package_name,
 +  $ebtables_manage = false,
  ) inherits ::firewall::params {
    $enable = $ensure ? {
 -    running => true,
 -    stopped => false,
 +    'running' => true,
 +    'stopped' => false,
    }
  
+   $_ensure_v6 = pick($ensure_v6, $ensure)
+ 
+   $_enable_v6 = $_ensure_v6 ? {
+     running => true,
+     stopped => false,
+   }
+ 
    package { 'iptables':
      ensure => $pkg_ensure,
    }

diff --cc manifests/linux/redhat.pp
Simple merge

diff --cc metadata.json
Simple merge

diff --cc spec/unit/classes/firewall_linux_redhat_spec.rb
Simple merge