From: Stefan Junker Date: Wed, 27 Jan 2016 11:10:53 +0000 (+0100) Subject: docs/ptp: update example and DNS description X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=abb6ee1dd19a69733e0b1b4adb69c3ed2f0eb268;p=cni.git docs/ptp: update example and DNS description --- diff --git a/Documentation/ptp.md b/Documentation/ptp.md index acde851..a786710 100644 --- a/Documentation/ptp.md +++ b/Documentation/ptp.md @@ -15,10 +15,9 @@ The traffic of the container interface will be routed through the interface of t "type": "host-local", "subnet": "10.1.1.0/24" }, - "dns": [ - "8.8.8.8", - "8.8.4.4" - ] + "dns": { + "nameservers": [ "10.1.1.1", "8.8.8.8" ] + } } ## Network configuration reference @@ -28,4 +27,4 @@ The traffic of the container interface will be routed through the interface of t * `ipMasq` (boolean, optional): set up IP Masquerade on the host for traffic originating from this network and destined outside of it. Defaults to false. * `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to value chosen by the kernel. * `ipam` (dictionary, required): IPAM configuration to be used for this network. -* `dns` (string array, optional): name servers to return as is in the [Result](/SPEC.md#result). Defaults to empty list. +* `dns` (dictionary, optional): DNS information to return as described in the [Result](/SPEC.md#result).