From 303e2cfcb14fb9dcec2fcda13608389f84bfb307 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 19 Jun 2015 18:04:11 -0300 Subject: Minor merge fixes --- manifests/init.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index abe731d..7491dee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,8 +6,8 @@ class firewall( $in_bandwidth = hiera('firewall::in_bandwidth', '100mbit'), $out_bandwidth = hiera('firewall::out_bandwidth', '100mbit'), $device_options = hiera('firewall::device_options', 'tcpflags,blacklist,routefilter,nosmurfs,logmartians'), - $vm_address = hiera('firewall::vm_address', '192.168.0.0/24'), - $vm_device = hiera('firewall::vm_device', false) + $vm_address = hiera('firewall::vm_address', '192.168.0.0/24'), + $vm_device = hiera('firewall::vm_device', false) ) { class { 'shorewall': } @@ -86,7 +86,7 @@ class firewall( # Hosts # $real_subnet_device = $vm_device ? { - false => $device, + false => $device, default => $vm_device, } @@ -107,7 +107,7 @@ class firewall( } $real_masq_interface = $vm_device ? { - false => "${device}!${vm_address}", + false => "${device}:!${vm_address}", default => "${device}", } -- cgit v1.2.3