Always add the local zone

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 161f632db601e6269b9787b1b9acabbab99b33eb..12e07294abfa701928f271019a2946200912fb06 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -154,6 +154,11 @@ class firewall(
     order => '3',
   }
 
+  shorewall::zone { 'loc':
+    type  => 'ipv4',
+    order => 4,
+  }
+
   #
   # Traffic shapping
   #

diff --git a/manifests/subsystems/firewall/local.pp b/manifests/subsystems/firewall/local.pp
index 7e23e290a7eda64fc5f2d5f9653775296a6d15fd..f17680edccc67b9b2362e968743ce87ca4d76554 100644 (file)
--- a/manifests/subsystems/firewall/local.pp
+++ b/manifests/subsystems/firewall/local.pp
@@ -5,11 +5,6 @@ class firewall::local(
   $manage_interface = hiera('nodo::firewall::local::manage_iface', false)
 ) {
 
-  shorewall::zone { 'loc':
-    type  => 'ipv4',
-    order => 4,
-  }
-
   if $manage_host {
     shorewall::host { "$interface-loc":
       name    => "$interface:$network",