Merge branch 'grouille' into 'master'

[nancy/grouille] Add vlan config

See merge request !176

input/grid5000/vlans.yaml

@@ -103,6 +103,7 @@ vlans:
       local nancy graffiti eth2 0 0 12 0
       local nancy grue eth0 0 0 13 0
       local nancy grappe eth0 0 0 14 0
+      local nancy grouille eth2 0 0 15 0
       local nantes econome eth0 0 0 0 0
       local nantes ecotype eth0 0 0 1 0
       local nantes ecotype eth1 0 0 2 0
@@ -156,6 +157,7 @@ vlans:
       global nancy graffiti eth2 0 0 28 0
       global nancy grue eth0 0 0 29 0
       global nancy grappe eth0 0 0 30 0
+      global nancy grouille eth2 0 0 31 0
       global rennes paravance eth0 0 0 32 0
       global rennes paravance eth1 0 0 32 100
       global rennes parasilo eth0 0 0 33 0
@@ -211,6 +213,7 @@ vlans:
       routed nancy graffiti eth2 0 16 12 0
       routed nancy grue eth0 0 16 13 0
       routed nancy grappe eth0 0 16 14 0
+      routed nancy grouille eth2 0 16 15 0
       routed rennes parapide eth0 0 24 0 0
       routed rennes parapluie eth1 0 24 1 0
       routed rennes paranoia eth0 0 24 2 0