From: Michael Watters <michael.watters@dart.biz>
Date: Fri, 14 Apr 2017 20:41:46 +0000 (-0400)
Subject: Change - Ensure that firewalld is stopped before iptables starts
X-Git-Tag: 1.9.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c902b4e609e9d37817dae364728d0506d9178057;p=puppet-modules%2Fpuppetlabs-firewall.git

Change - Ensure that firewalld is stopped before iptables starts

firewalld must be stopped and disabled before the iptables service
will start properly.
---

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index e174b80..1a54e90 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -30,7 +30,7 @@ class firewall::linux::redhat (
     service { 'firewalld':
       ensure => stopped,
       enable => false,
-      before => Package[$package_name],
+      before => [Package[$package_name], Service[$service_name]],
     }
   }
 
diff --git a/spec/unit/classes/firewall_linux_redhat_spec.rb b/spec/unit/classes/firewall_linux_redhat_spec.rb
index 90dbcd5..bd80d07 100644
--- a/spec/unit/classes/firewall_linux_redhat_spec.rb
+++ b/spec/unit/classes/firewall_linux_redhat_spec.rb
@@ -87,7 +87,7 @@ describe 'firewall::linux::redhat', :type => :class do
         it { should contain_service('firewalld').with(
           :ensure => 'stopped',
           :enable => false,
-          :before => 'Package[iptables-services]'
+          :before => ['Package[iptables-services]', 'Service[iptables]']
         )}
 
         it { should contain_package('iptables-services').with(