Merge branch 'ipv4-changes' into 'master'

Ipv4 changes

See merge request !1142

input/grid5000/ipv4.yaml

@@ -142,6 +142,7 @@ ipv4:
       rennes roazhon11 eth0 0 0 14 36
       rennes roazhon12 eth0 0 0 14 39
       rennes roazhon13 eth0 0 0 14 44
+      rennes roazhon14 eth0 0 0 14 52
       sophia mercantour1 eth0 0 0 2 0
       sophia mercantour2 eth0 0 0 2 16
       sophia mercantour2 ib0  0 0 2 16
@@ -168,7 +169,8 @@ ipv4:
       sophia esterel10 eth1 0 0 3 11
       sophia esterel10 ib0 0 0 3 11
       sophia esterel11 eth0 0 0 3 14
-      sophia esterel12 eth0 0 0 3 15
+      sophia esterel12 eth0 0 0 3 16
+      sophia esterel12 ib0 0 0 3 16
       sophia esterel13 eth0 0 0 3 17
       sophia esterel14 eth0 0 0 3 18
       sophia esterel15 eth0 0 0 3 19