From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Jan 2013 23:38:53 +0000 (-0200)
Subject: Using in_bandwidth and out_bandwidth as parameters at firewall class
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f7a053a17acb29c88db15c2aecf2a6e8118067b4;p=puppet-nodo.git

Using in_bandwidth and out_bandwidth as parameters at firewall class
---

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 0bde7ba..d6f7644 100644
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -1,6 +1,8 @@
 # firewall definitions for physical servers
 class firewall(
-  $local_net = hiera('nodo::firewall::local_net',              false),
+  $local_net     = hiera('nodo::firewall::local_net',     false),
+  $in_bandwidth  = hiera('nodo::firewall::in_bandwidth',  '2mbit'),
+  $out_bandwidth = hiera('nodo::firewall::out_bandwidth', '2mbit')
 ) {
   class { 'shorewall': }
 
@@ -155,16 +157,6 @@ class firewall(
   #
   # Traffic shapping
   #
-  $in_bandwidth = $max_in_bandwidth ? {
-    ''      => "2mbit",
-    default => "$max_in_bandwidth",
-  }
-
-  $out_bandwidth = $max_out_bandwidth ? {
-    ''      => "2mbit",
-    default => "$max_out_bandwidth",
-  }
-
   shorewall::tcdevices { "eth0":
     in_bandwidth  => "$in_bandwidth",
     out_bandwidth => "$out_bandwidth",