Update vswitch to a36332da0ddb9d419e1d3f9d170058284b144f06

a36332da0ddb9d419e1d3f9d170058284b144f06 Merge "Release 1.0.0 - Juno"
b3fdd245a59b36fbc943bed481ac26c6f987845a Release 1.0.0 - Juno
fab186f37b8729401913f765ce22d401a2ef3485 Fixed issue with vlan on redhat provider

Puppetfile

@@ -171,7 +171,7 @@ mod 'vlan',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => '51fd30c22b79d927fb0329e6e2b58fe67217ecee',
+  :commit => 'a36332da0ddb9d419e1d3f9d170058284b144f06',
   :git => 'https://github.com/stackforge/puppet-vswitch.git'
 
 mod 'xinetd',

vswitch/README.md

@@ -1,4 +1,8 @@
-# puppet-vswitch
+VSwitch
+=======
+
+1.0.0 - 2014.2.0 - Juno
+
 A Puppet module providing things for vSwitches. At the moment OVS is the only
 one I've added but please feel free to contribute new providers through
 Stackforge. It's based upon types and providers so we can support more then just

vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb

@@ -39,6 +39,9 @@ def create
       end
 
       port = IFCFG::Port.new(@resource[:interface], @resource[:bridge])
+      if vlan?
+        port.set('VLAN' => 'yes')
+      end
       port.save(BASE + @resource[:interface])
 
       bridge = IFCFG::Bridge.new(@resource[:bridge], template)
@@ -115,6 +118,17 @@ def from_str(data)
         items.merge!(m[1] => m[2])
       end
     end
+    items.delete('VLAN') if items.has_key?('VLAN')
     items
   end
+
+  def vlan?
+    if File.read('/proc/net/vlan/config') =~ /#{@resource[:interface]}/
+      return true
+    else
+      return false
+    end
+  rescue Errno::ENOENT
+    return false
+  end
 end