From: Simon Deziel <simon.deziel@gmail.com>
Date: Sat, 12 May 2012 15:23:45 +0000 (-0400)
Subject: (#14455) Support interface names containing "+"
X-Git-Tag: 0.1.0~32^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=345518122f0e9d68b4037d4cbdcb485b4d878f78;p=puppet-modules%2Fpuppetlabs-firewall.git

(#14455) Support interface names containing "+"

Previously iniface and outiface wouldn't allow + in the interface names. This
patch fixes that.
---

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index a5cc872..59db2ea 100644
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -295,14 +295,14 @@ Puppet::Type.newtype(:firewall) do
     desc <<-EOS
       Input interface to filter on.
     EOS
-    newvalues(/^[a-zA-Z0-9\-\._]+$/)
+    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
   end
 
   newproperty(:outiface, :required_features => :interface_match) do
     desc <<-EOS
       Output interface to filter on.
     EOS
-    newvalues(/^[a-zA-Z0-9\-\._]+$/)
+    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
   end
 
   # NAT specific properties