From b5a9073efbff7c1e05eb2cbe425dcc41cc271f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 17 Jan 2013 11:17:51 +0200
Subject: [PATCH] Fixed firewall module for Fedora 18.

---
 firewall/manifests/init.pp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/firewall/manifests/init.pp b/firewall/manifests/init.pp
index 0f0ed9d..489e753 100644
--- a/firewall/manifests/init.pp
+++ b/firewall/manifests/init.pp
@@ -111,6 +111,13 @@ class firewall::common::iptables {
     }
     $ip6states = versioncmp($::kernelversion, "2.6.20")
 
+    if $::operatingsystem == "Fedora" and $::operatingsystemrelease > 17 {
+        package { "firewalld":
+            ensure => absent,
+            before => Package["iptables"],
+        }
+    }
+
     package { "iptables":
         ensure => installed,
         name   => $::operatingsystem ? {
@@ -119,7 +126,8 @@ class firewall::common::iptables {
             "debian" => [ "iptables", "iptables-persistent" ],
             "fedora" => $::operatingsystemrelease ? {
                 /^1[0-5]/ => [ "iptables", "iptables-ipv6" ],
-                default   => "iptables",
+                /^1[6-7]/ => "iptables",
+                default   => [ "iptables", "iptables-services" ],
             },
             "ubuntu" => [ "iptables", "iptables-persistent" ],
         },