Madhu Venugopal
26468ebdf0
Updated Vagrant with the latest UX
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-12 13:54:58 -07:00
Madhu Venugopal
a78deeff3c
Moved the default local and global store to new root
...
This is required in order to provide a clean switchover.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-11 22:57:24 -07:00
Madhu Venugopal
872cf3c5b1
Merge pull request #631 from mrjana/bugs
...
Update libkv godeps
2015-10-11 16:22:35 -07:00
Jana Radhakrishnan
3b24e85ce5
Update libkv godeps
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-11 16:02:16 -07:00
Madhu Venugopal
ecec37a3e0
Merge pull request #630 from mrjana/bugs
...
Make ipamutils compile for windows
2015-10-10 13:45:30 -07:00
Jana Radhakrishnan
e9f2439673
Make ipamutils compile for windows
...
currently ipamutils package uses apis which are linux
specific and makes windows compile error out. Separated
the OS specific apis into linux and windows files to
diverge the implementation.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-10 13:16:52 -07:00
Jana Radhakrishnan
9d82eec664
Merge pull request #629 from sanimej/slice
...
Fix the overlay cleanup in the multi-subnet case
2015-10-10 13:01:52 -07:00
Jana Radhakrishnan
a90468b00e
Merge pull request #623 from aboch/ipc
...
Miscellaneous changes for ipam docker integration
2015-10-10 11:09:55 -07:00
Madhu Venugopal
bc2fb8a45b
Merge pull request #628 from mavenugo/vin-fixes
...
Default bridge need not have persistence in bridge driver
2015-10-10 09:51:14 -07:00
Madhu Venugopal
c0b5b3df0b
Default bridge need not have persistence in bridge driver
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-10 09:00:35 -07:00
Madhu Venugopal
180042feb4
Merge pull request #624 from aboch/bs6
...
Remove num bit limitation in bitsequence
2015-10-10 06:11:24 -07:00
Alessandro Boch
1cdfac15be
Reduce logging verbosity in allocator
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-10 05:42:31 -07:00
Alessandro Boch
094b657ff9
Remove 2^32 bits restriction on bitsequence
...
- Allow bitsequence of length 2^64-1
- Updated ID Manager and IPAM
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-10 05:42:26 -07:00
aboch
b5e66b502d
Merge pull request #627 from mavenugo/vin-fixes
...
Few more fixes identified during integration
2015-10-10 04:09:25 -07:00
Madhu Venugopal
16e1647872
Few more fixes identified during integration
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-10 03:49:39 -07:00
Jana Radhakrishnan
15be04dbde
Merge pull request #611 from sanimej/slice
...
marshal/unmarshal for overlay multiple subnets
2015-10-09 20:17:20 -07:00
Madhu Venugopal
ab2a9e6cba
Merge pull request #625 from aboch/acf
...
Relax restriction on IpamConfig
2015-10-09 20:04:15 -07:00
Madhu Venugopal
fbc701d8d7
Merge pull request #626 from mrjana/bugs
...
Network ep count increment/decrement needs retry
2015-10-09 20:03:29 -07:00
Jana Radhakrishnan
73935333f6
Network ep count increment/decrement needs retry
...
Today we try to increment/decrement endpoint count
only once even if it is a key modified error. In case
of key modified error we should retry it to allow it to
succeed.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 19:37:25 -07:00
Alessandro Boch
eda95b48f4
Relax restriction on IpamConfig
...
- Both an empty and nil list of IpamConf object
will trigger auto-allocation for ipv4.
Auto-allocation for ipv6 will still be excluded
in the two cases above.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 17:54:28 -07:00
Alessandro Boch
e2620d6b3e
Preserve default ipam driver setting
...
- If IPAMConf does not contain an ipam driver setting
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 14:24:49 -07:00
Alessandro Boch
49cbd88831
Network to expose ipam config
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 14:24:38 -07:00
Madhu Venugopal
dda36227d3
Merge pull request #622 from mrjana/bugs
...
Move sandbox resources when container restarts
2015-10-09 13:56:59 -07:00
Jana Radhakrishnan
a559c45f0a
Move sandbox resources when container restarts
...
Currently when container has a restart policy and gets
restarted, docker does not release networking and allocate
it back. But it presents libnetwork with a new sandbox while
all the network resources are locked in the old sandbox. This
commit attempts to move all the network resources from the old
sandbox to the new sandbox when libnetwork is presented with the
new sandbox.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 13:43:25 -07:00
Jana Radhakrishnan
cc8a9df7f4
Merge pull request #621 from mavenugo/vin-fixes
...
move Labels from array to map to be consistent with docker
2015-10-09 11:25:31 -07:00
Madhu Venugopal
998617236b
move Labels from array to map to be consistent with cotnainers
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 11:08:13 -07:00
Jana Radhakrishnan
5347a05701
Merge pull request #618 from mavenugo/vin-fixes
...
Fixed a bridge driver bug in unmarshalling DefaultBridge
2015-10-09 08:40:25 -07:00
Madhu Venugopal
29f9670d0b
Fixed a bridge driver bug in unmarshalling DefaultBridge
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 03:53:22 -07:00
Jana Radhakrishnan
59ae76f6c0
Merge pull request #616 from mavenugo/vin-fixes
...
Fixed a couple of error messages to address UX related comments
2015-10-09 02:12:50 -07:00
Madhu Venugopal
fd583747c8
Fixed a couple of error messages to address UX related comments
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 01:45:24 -07:00
Jana Radhakrishnan
0cfe3bafc2
Merge pull request #222 from aboch/nlb
...
Labels support for Network Create
2015-10-09 01:16:48 -07:00
Alessandro Boch
d53a6f9815
Enable network labels in Rest API
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 01:06:20 -07:00
Alessandro Boch
fbe33267f0
Enable Network labels in backend
...
- Allow labels to be passed to network driver during network create
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 01:06:15 -07:00
Alessandro Boch
9df6bb2778
Add netlable. KeyValue() and ToMap()
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 00:21:09 -07:00
Madhu Venugopal
a08562d89e
Merge pull request #615 from mrjana/bridge
...
Make the integration tests robust
2015-10-09 00:17:37 -07:00
Jana Radhakrishnan
a92fadbe59
Make the integration tests robust
...
Currently integration test is a bit flaky because of
variability in the dnet bootup time. Fixed it to wait for
dnet to come up before performing any tests.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 00:06:51 -07:00
Jana Radhakrishnan
b77b0b054d
Merge pull request #612 from aboch/bip
...
Retire ipallocator
2015-10-08 22:29:08 -07:00
Madhu Venugopal
7eac5d1a59
Merge pull request #613 from mrjana/bridge
...
Make bridge driver networks persistent
2015-10-08 21:46:18 -07:00
Jana Radhakrishnan
81f8ce8536
Add default network restart test case
...
Added restart test for default network so that we can test
bridge network persistence. Also added changes to dnet to
delete the default network if it is present.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-08 21:31:19 -07:00
Jana Radhakrishnan
845ef40a45
Make bridge driver networks persistent
...
Since libnetwork is going to provide createNetwork
notifications only once when the network is created
bridge network needs to save it's network state in
persistent store so that it becomes available even
after restart.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-08 20:42:45 -07:00
Alessandro Boch
bc4a61cadf
Retire ipallocator
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-08 18:19:25 -07:00
Jana Radhakrishnan
e57c67d6bf
Merge pull request #600 from aboch/br
...
Bridge driver changes to support IPAM model
2015-10-08 16:30:43 -07:00
Alessandro Boch
a49fb6b897
Phase-2 bridge driver changes to support IPAM
...
- Set bridge ipv4 address when bridge is present
- IPv6 changes for bridge
- Convert unit tests to the new model
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-08 16:22:03 -07:00
Jana Radhakrishnan
ed7d9045b4
Merge pull request #610 from mavenugo/revert-598
...
Revert "Share libkv store handles across datastore handles"
2015-10-08 15:57:21 -07:00
Madhu Venugopal
55ef6e6101
Merge pull request #602 from dhiltgen/tls
...
Add support for configuring TLS
2015-10-08 15:56:10 -07:00
Jana Radhakrishnan
2fa6d67f34
Merge pull request #607 from mavenugo/libkv-upd
...
Libkv update with boltdb concurrent connection fix
2015-10-08 15:40:24 -07:00
aboch
116947dfc0
Merge pull request #604 from mavenugo/vin-fixes
...
Fixed a few issues identified during docker integration
2015-10-08 15:35:54 -07:00
Madhu Venugopal
4a5989d6cc
Revert "Share libkv store handles across datastore handles"
2015-10-08 15:29:07 -07:00
Madhu Venugopal
bc4190db87
Removing boltdb timeout
...
Now that libkv supports concurrent access to boltdb, there is no point
in depending on timeout mechanism
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-08 15:02:03 -07:00
Madhu Venugopal
3c623fab9f
Godep update to libkv 1.9.0-integ branch
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-08 15:01:17 -07:00