From 830e554e651f1c42df106c24606d7090f4360b12 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Mon, 21 Jul 2014 15:14:42 +0300
Subject: [PATCH] firewall: Fixed installation for CentOS 7.

---
 firewall/manifests/init.pp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/firewall/manifests/init.pp b/firewall/manifests/init.pp
index 7e242a6..1cbbbcb 100644
--- a/firewall/manifests/init.pp
+++ b/firewall/manifests/init.pp
@@ -134,12 +134,23 @@ class firewall::common::iptables {
       }
       'centos','redhat': {
         package { "iptables":
-          ensure  => installed,
-          require => Package["iptables-ipv6"],
-        }
-        package { "iptables-ipv6":
           ensure => installed,
         }
+        if versioncmp($::operatingsystemrelease, 7) == 1 {
+          package { "firewalld":
+            ensure => absent,
+            before => Package["iptables"],
+          }
+          package { "iptables-services":
+            ensure => installed,
+            before => Package["iptables"],
+          }
+        } else {
+          package { "iptables-ipv6":
+            ensure => installed,
+            before => Package["iptables"],
+          }
+        }
       }
       'fedora': {
         package { "iptables":