replayed pr razorsedge#87 by Millnert to enable vlan by device

Author: Jan Kapellen

README.md

@@ -247,26 +247,21 @@ Static interface routes (host route):
 
 Normal interface - VLAN - no IP:
 
-    class { 'network::global':
-      vlan => 'yes',
-    }
-
     network::if { 'eth0.330':
       ensure => 'up',
-    }
+      vlan => 'yes',
+   }
 
 Normal interface - VLAN - static IPv4:
 
-    class { 'network::global':
-      vlan => 'yes',
-    }
-
     network::if::static { 'eth0.330':
       ensure    => 'up',
       ipaddress => '10.2.3.248',
       netmask   => '255.255.255.0',
+      vlan => 'yes',
     }
 
+
 Promiscuous interface:
     To set a static or dynamic interface to promiscuous mode (RedHat only), add:
       promisc => true

manifests/if/static.pp

@@ -29,6 +29,7 @@
 #   $defroute       - optional
 #   $restart        - optional - defaults to true
 #   $arpcheck       - optional - defaults to true
+#   $vlan           - optional - defaults to false
 #
 # === Actions:
 #
@@ -82,6 +83,7 @@
   $metric = undef,
   $restart = true,
   $arpcheck = true,
+  $vlan = false,
 ) {
   # Validate our data
   if $ipaddress {
@@ -118,6 +120,7 @@
   validate_bool($manage_hwaddr)
   validate_bool($flush)
   validate_bool($arpcheck)
+  validate_bool($vlan)
 
   network_if_base { $title:
     ensure          => $ensure,

manifests/init.pp

@@ -79,6 +79,7 @@
 #   $promisc         - optional - defaults to false
 #   $restart         - optional - defaults to true
 #   $arpcheck        - optional - defaults to true
+#   $vlan            - optional - defaults to false
 #
 # === Actions:
 #
@@ -140,6 +141,7 @@
   $promisc         = false,
   $restart         = true,
   $arpcheck        = true,
+  $vlan            = false,
 ) {
   # Validate our booleans
   validate_bool($noaliasrouting)
@@ -155,6 +157,7 @@
   validate_bool($promisc)
   validate_bool($restart)
   validate_bool($arpcheck)
+  validate_bool($vlan)
   # Validate our regular expressions
   $states = [ '^up$', '^down$' ]
   validate_re($ensure, $states, '$ensure must be either "up" or "down".')
@@ -192,7 +195,10 @@
     }
     $iftemplate = template('network/ifcfg-eth.erb')
   }
-
+  $vlanyes = $vlan ? {
+    true    => 'yes',
+    default => undef,
+  }
   if $flush {
     exec { 'network-flush':
       user        => 'root',

templates/ifcfg-eth.erb

@@ -70,4 +70,6 @@ check_link_down() {
 <% end -%>
 <% if !@arpcheck %>ARPCHECK=no
 <% end -%>
+<% if @vlanyes %>VLAN=<%= @vlanyes %>
+<% end -%>
 NM_CONTROLLED=no