From 78a678ca46a45292322592f536aff75c637ed442 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 23 Jan 2013 11:12:23 -0200
Subject: Changing class firewall::local to use hiera

---
 manifests/subsystems/firewall.pp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'manifests/subsystems/firewall.pp')

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 293b827..59bc1f1 100644
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -1,8 +1,10 @@
 # firewall definitions for physical servers
-class firewall {
+class firewall(
+  $local_net = hiera('firewall::local_net',              false),
+) {
   class { 'shorewall': }
 
-  $rfc1918 = $shorewall_local_net ? {
+  $rfc1918 = $local_net ? {
     true    => true,
     false   => false,
     default => false,
@@ -201,12 +203,7 @@ class firewall {
     options   => "default",
   }
 
-  if $shorewall_local_net {
-    class { "firewall::local":
-      network          => $shorewall_local_net_network,
-      interface        => $shorewall_local_net_iface,
-      manage_host      => $shorewall_local_net_manage_host,
-      manage_interface => $shorewall_local_net_manage_iface,
-    }
+  if $local_net {
+    class { "firewall::local": }
   }
 }
-- 
cgit v1.2.3