From: cdenneen <cdenneen@gmail.com>
Date: Wed, 3 Sep 2014 17:14:06 +0000 (-0400)
Subject: Centos 7 won't work with operatingsystemrelease 7.0
X-Git-Tag: 1.2.0~1^2~2^2~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4563e2d4f3084ff1f6b901d2cbd77d46c9e4d55f;p=puppet-modules%2Fpuppetlabs-firewall.git

Centos 7 won't work with operatingsystemrelease 7.0

Centos 7 operatingsystemrelease is 7.0.1406 for example so switching to operatingsystemmajrelease would allow for 7 to be used for all EL7 products
---

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index b7a4d0e..6fdc694 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -20,7 +20,7 @@ class firewall::linux::redhat (
   # RHEL 7 and later and Fedora 15 and later require the iptables-services
   # package, which provides the /usr/libexec/iptables/iptables.init used by
   # lib/puppet/util/firewall.rb.
-  if   ($::operatingsystem != 'Fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0)
+  if   ($::operatingsystem != 'Fedora' and versioncmp($::operatingsystemmajrelease, '7') >= 0)
     or ($::operatingsystem == 'Fedora' and versioncmp($::operatingsystemrelease, '15') >= 0) {
     package { 'firewalld':
       ensure  => absent,