Merge branch 'master' into ipvlan-master-intf-ipam

This commit is contained in:
Paul Fisher
2018-01-25 15:06:06 -08:00
committed by GitHub
51 changed files with 1522 additions and 818 deletions

View File

@ -28,7 +28,7 @@ Because all ipvlan interfaces share the MAC address with the host interface, DHC
* `name` (string, required): the name of the network.
* `type` (string, required): "ipvlan".
* `master` (string, required unless chained): name of the host interface to enslave.
* `mode` (string, optional): one of "l2", "l3". Defaults to "l2".
* `mode` (string, optional): one of "l2", "l3", "l3s". Defaults to "l2".
* `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to the value chosen by the kernel.
* `ipam` (dictionary, required unless chained): IPAM configuration to be used for this network.