From: abednarik <alejandro.bednarik@gmail.com>
Date: Wed, 4 Nov 2015 22:02:56 +0000 (-0300)
Subject: (MODULES-2783) Missing ip6tables service name
X-Git-Tag: 1.8.0~12^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=67798676891f9c4c49b92fbdf8b413945bace4a3;p=puppet-modules%2Fpuppetlabs-firewall.git

(MODULES-2783) Missing ip6tables service name

Replaced hardcoded iptables service references with $service_name
variable.
---

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index 3144ae7..680c04b 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -46,7 +46,7 @@ class firewall::linux::redhat (
       exec { '/usr/bin/systemctl daemon-reload':
         require => Package[$package_name],
         before  => Service[$service_name],
-        unless  => '/usr/bin/systemctl is-active iptables'
+        unless  => "/usr/bin/systemctl is-active ${service_name}",
       }
     }
   }
@@ -55,7 +55,7 @@ class firewall::linux::redhat (
     ensure    => $ensure,
     enable    => $enable,
     hasstatus => true,
-    require   => File['/etc/sysconfig/iptables'],
+    require   => File["/etc/sysconfig/${service_name}"],
   }
 
   # Redhat 7 selinux user context for /etc/sysconfig/iptables is set to unconfined_u
@@ -71,7 +71,7 @@ class firewall::linux::redhat (
     default:     { $seluser = undef }
   }
 
-  file { '/etc/sysconfig/iptables':
+  file { "/etc/sysconfig/${service_name}":
     ensure  => present,
     owner   => 'root',
     group   => 'root',