Commit graph

72 commits

Author SHA1 Message Date
Alessandro Boch
254d082cc3 Add ConnectivityScope capability for network drivers along with scope network option
- It specifies whether the network driver can
  provide containers connectivity across hosts.
- As of now, the data scope of the driver was
  being overloaded with this notion.
- The driver scope information is still valid
  and it defines whether the data allocation
  of the network resources can be done globally
  or only locally.
- With the scope network option, user can now
  force a network as swarm scoped
  regardless of the driver data scope.
- In case the network is configured as swarm scoped,
  and the network driver is multihost capable,
  a network DB instance will be launched for it.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-12 17:16:34 -07:00
Quan Tian
2243480e99 Fix typo in remote.md
Signed-off-by: Quan Tian <tianquan@cloudin.cn>
2017-02-14 15:18:22 +08:00
Quan Tian
8059597722 Fix typo in IPAM doc
Signed-off-by: Quan Tian <tianquan@cloudin.cn>
2017-02-13 18:35:32 +08:00
Alessandro Boch
b72225a005 Merge pull request #1471 from datastream/patch-1
doc update
2017-01-05 11:23:19 -08:00
Xianjie
32e713eca6 fix json
Signed-off-by: user.name <datastream@datastream-laptop.local>
Signed-off-by: datastream <guxianjie@gmail.com>
2017-01-05 01:52:37 +08:00
Alessandro Boch
64002895a5 Merge pull request #1604 from allencloud/fix-nits-in-comments
fix nits in error and log
2016-12-29 12:20:04 -08:00
Alessandro Boch
83ba440de9 Merge pull request #1603 from YuPengZTE/devFirst
fix typos
2016-12-29 12:18:47 -08:00
Alessandro Boch
311dfbb49e Merge pull request #1383 from npcode/patch-2
docs/remote.md: Remove unnecessary backquote
2016-12-29 12:07:04 -08:00
Yi EungJun
11be70cf5e docs/remote.md: Remove unnecessary backquote
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-12-30 04:26:17 +09:00
yupeng
c702e19e44 fix typos
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-12-29 11:09:57 +08:00
allencloud
bc85efdb4f fix nits in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-28 18:49:18 +08:00
Jana Radhakrishnan
ea579a4d0e Merge pull request #1477 from allencloud/fix-nits-in-comments
fix nits in comments and log
2016-11-02 09:58:18 -07:00
yuexiao-wang
807f14746d Modify the serial number from 1 to 9
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-31 18:28:37 +08:00
allencloud
a1ed5b7be2 fix nits in comments and log
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-29 19:35:18 +08:00
Jana Radhakrishnan
8a225de00d Merge pull request #1205 from allencloud/fix-typos
use grep to find a/an misuse
2016-08-01 09:49:31 -07:00
Jana Radhakrishnan
4a853b3c8c Merge pull request #1308 from leecalcote/patch-2
docs/ipam.md: spelling error
2016-08-01 09:48:23 -07:00
Erich Cordoba
829a4ee4be Fix several typos on macvlan docs
Signed-off-by: Erich Cordoba <erich.cm@yandex.com>
2016-07-19 21:14:57 -05:00
Lee Calcote
dc4487dbb0 docs/ipam.md: spelling error
Changed "lifecyle" to "lifecycle".

Signed-off-by: Lee Calcote <leecalcote@gmail.com>
2016-07-01 11:03:54 -05:00
Brent Salisbury
500a255181 Fixed missing v6 enable flag in macvlan doc
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-22 19:59:55 -04:00
Brent Salisbury
165a1f6021 Added docs for macvlan driver
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-20 05:55:45 -04:00
Lee Calcote
5c5a43124a design.md: fixed anchor reference
The #Drivers reference needed to be #drivers in order for the anchor to work correctly.

Signed-off-by: Lee Calcote <leecalcote@gmail.com>
2016-06-14 06:30:03 -05:00
Madhu Venugopal
1242f27cb5 Merge pull request #1130 from aboch/noips
Avoid persisting ipam data if it can be reconstructed
2016-06-03 19:08:02 -07:00
allencloud
9f415d0cdb use grep to find a/an misuse
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-03 16:35:33 +08:00
allencloud
de588f950d fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-30 18:20:52 +08:00
Alessandro Boch
651f6ea0fa Avoid persisting ipam data if it can be reconstructed
- Also restore older behavior where overlap check is not run
  when preferred pool is specified. Got broken by recent changes

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-12 10:27:10 -07:00
Bearice Ren
e82b92182f typo fix
Signed-off-by: Bearice Ren <bearice@gmail.com>
2016-04-14 11:12:35 +08:00
Alessandro Boch
b8134d571b Merge pull request #1045 from darrenstahlmsft/grammarFix
Change 'an user' to 'a user'
2016-04-13 10:54:40 -07:00
Alessandro Boch
8e6d52fa80 Use newly introduce plugins method to validate plugin response
- for endpoints which are not expected to be implemented
  by all remote drivers.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-04-08 23:10:25 -07:00
Darren Stahl
70be85fa40 Change 'an user' to 'a user'
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-22 17:01:26 -07:00
Alessandro Boch
6b209991aa Fix IPAM driver documentation
- ipam.md should only describe the contract
  which is relevant to remote ipam plugins.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-02 15:56:46 -08:00
Bryan Boreham
81c586e0e5 Stop referring to requested IP address as "preferred",
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-26 15:09:29 +00:00
Ryan Belgrave
16ff947fb6 IpamOptions per network not per ipam subnet
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-07 21:28:54 -05:00
Alessandro Boch
29299b73df Allow remote IPAM driver to express capability
- So that a DHCP based plugin can express it needs
  the endpoint MAC address when requested for an IP address.
- In such case libnetwork will allocate one if not already
  provided by user

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-17 15:41:47 -08:00
Alessandro Boch
2eadfb8290 Don't connect sbx to default gw nw if default static route is provided
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-02 20:00:27 -08:00
Zach
a87a58e2be Changing image file-path in design doc 2015-12-01 18:56:49 -08:00
zachgersh
1d88c10f98 Adds cnm directly to repo 2015-12-01 18:56:49 -08:00
Zach
20e5a0503a Add nice image illustrating CNM
Figured it would be nice to include the visual aid for anyone who wants to refer back it.
2015-12-01 18:56:49 -08:00
Alex Chan
e5d280edac Tidy up the IPAM driver doc
Signed-off-by: Alex Chan <alex@alexwlchan.net>
2015-10-26 12:47:05 +00:00
Jana Radhakrishnan
57a6888b64 Merge pull request #640 from aboch/di
IPAM driver documentation
2015-10-12 16:55:53 -07:00
Alessandro Boch
6b77f04e9b IPAM driver doc
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-12 16:39:24 -07:00
Madhu Venugopal
9ae62c93dd Updated Vagrant with the latest UX
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-12 13:54:58 -07:00
Jana Radhakrishnan
e412743e45 Merge pull request #574 from frntn/patch-1
Update overlay.md
2015-10-06 15:04:38 -07:00
Madhu Venugopal
b75601e84d Updating the network driver document with IPAM data
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-03 16:38:24 -07:00
Madhu Venugopal
0066225da5 Integration with Docker Discovery
* integrated hostdiscovery package with the new Docker Discovery
* Integrated hostdiscovery package with libnetwork core
* removed libnetwork_discovery tag
* Introduced driver apis for discovery events
* moved overlay driver to make use of the discovery events
* Using Docker Discovery service.
* Changed integration-tests to make use of the new discovery

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-01 12:32:55 -07:00
Matthieu Fronton
aa3db80a5b Update overlay.md 2015-09-30 16:57:32 +02:00
Zhang Wei
6b1fcf3e6a fix bad docs format
Fix some bad docs format

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-09-19 18:09:13 +08:00
Tom Denham
9e6378ad57 Correct formatting in remote.md
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2015-09-17 16:15:41 -07:00
Zhang Wei
304bfd6261 Add negotiation process for driver scope
Add one capability negotiation interaction after plugin handshake, use
this to determine plugin's capability instead of default "global" scope.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-09-15 16:45:38 +08:00
Jana Radhakrishnan
a5bd12b963 Remove multiple interface in an endpoint
Currently the endpoint data model consists of multiple
interfaces per-endpoint. This seems to be an overkill
since there is no real use case for it. Removing it
to remove unnecessary complexity from the code.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-11 09:19:01 -07:00
Madhu Venugopal
0b458d70ce Fixing Vagrant to use ubuntu 15.04 to get Experimental docker working again
14.10 reached EOL recently and hence experimental builds are not built for
that distro any more. Upgrading it to 15.04 means handling the systemd
specific docker daemon configs required for multi-host networking.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-07-31 18:08:27 -07:00