From: TP Honey <tphoney@users.noreply.github.com>
Date: Tue, 26 Sep 2017 11:21:06 +0000 (+0100)
Subject: Merge pull request #694 from knackaron/ip6tables-disable
X-Git-Tag: 1.10.0~13
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2ddfc4a4357e8e39191dc968bb8d9aa3ab1c750e;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge pull request #694 from knackaron/ip6tables-disable

allow ip6tables to be disabled
---

2ddfc4a4357e8e39191dc968bb8d9aa3ab1c750e
diff --cc manifests/init.pp
index ba79021,5e824d2..73b6892
--- a/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 a48cca7,403760b..c5228ca
--- a/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,
    }