Bryan Boreham
3ad9d8e785
Don't fail start if image is missing
2016-03-09 17:10:20 +00:00
Matthias Radestock
f8e2af32cd
refactor: extract common docker run options
2016-03-08 23:10:19 +00:00
Adam Harrison
6584df274e
Implement weave consense
2016-03-03 18:52:09 +00:00
Bryan Boreham
b76e2a87cf
Store address+subnet prefix for 'owned' addresses
2016-03-02 17:21:24 -08:00
Bryan Boreham
b6eec08247
Return all applicable results from Lookup
...
and stop erroring on Lookup not found; just return a blank result
2016-03-02 17:01:12 -08:00
Adam Harrison
cb9af20a2e
Replace PROCFS with --pid=host
2016-03-01 20:10:47 +00:00
Bryan Boreham
f17d50cc50
Check the exact version of the image, not the base
2016-02-26 23:44:04 +00:00
Bryan Boreham
436f8ef7c8
Compare the environment so we can detect a change in password
2016-02-26 23:41:57 +00:00
Bryan Boreham
561c8d012c
Treat a restarting container like a running one, for idempotency
2016-02-26 23:41:46 +00:00
Bryan Boreham
bb4c0f5247
Start existing container, if its image and arguments match
2016-02-26 23:40:02 +00:00
Tom Wilkie
6ff7419981
Review feedback
2016-02-26 15:35:12 +00:00
Tom Wilkie
b228bbb9fb
Periocially check for up to date versions of weave.
2016-02-26 15:35:12 +00:00
Matthias Radestock
752baa4bd6
remove unnecessary WEAVE_CIDR=none
...
since the router is now always running with --net=host
2016-02-26 13:58:06 +00:00
Matthias Radestock
6cbde89eeb
refactor: consistency in specification of common docker run options
2016-02-26 13:57:37 +00:00
Adam Harrison
6f65512471
Merge branch '1.4'
2016-02-23 10:47:08 +00:00
Matthias Radestock
ee531b8023
don't complain on relaunch when ODP is not supported
...
...and WEAVE_NO_FASTDP isn't set.
Fixes #1929 .
2016-02-18 22:00:08 +00:00
Adam Harrison
5dd8584fb6
Fix veth cleanup on Ubuntu 15.10
...
Cope with the @ characters that have started appearing in veth names as
of Ubuntu 15.10.
2016-02-18 12:11:48 +00:00
Matthias Radestock
4bd18737b7
fix typo
2016-02-18 11:39:54 +00:00
Matthias Radestock
11e2515f70
Merge pull request #1968 from weaveworks/refactor-veth-creation
...
"refactor" veth creation
2016-02-10 13:49:13 +00:00
Adam Harrison
4cee647e73
Make weaveutil container-addrs observe $PROCFS
2016-02-09 22:25:47 +00:00
Matthias Radestock
7ea3299dc6
oops
...
/usr/local/bin/weave: 1172: [: true false: unexpected operator
This got broken in #1941 .
2016-02-09 22:05:11 +00:00
Matthias Radestock
5707581ba3
Merge pull request #1964 from weaveworks/weave-veth-cleanup
...
Fix attach-bridge bugs
2016-02-09 21:11:27 +00:00
Adam Harrison
264d5e4828
Make attach-bridge iptables rule insertion idempotent
2016-02-09 20:42:59 +00:00
Matthias Radestock
9311294d9c
"refactor" veth creation
...
Invoke the new create_veth from a few places, eliminating code
duplication and inconsistencies.
Semantic differences:
- init_bridged_fastdp now skips the veth creation/config if the veth
already exists. This eliminates routing blips. Though in reality
something very strange must have happened to end up in this code
with an existing veth.
- init_bridged_fastdp no longer deletes the $BRIDGE and $DATAPATH when
veth creation/configuration fails. This is consistent with
init_bridge, which does not delete $BRIDGE when something goes
wrong. And it is generally desirable since the init_* functions are
invoked on potentially existing bridges - e.g. following 'weave
stop'.
- attach_bridge and setup_router_iface_bridge used to mark one veth
end 'up', then invoke add_iface_* for it, and then mark the other
end 'up'. create_veth marks both ends 'up' first. This makes no
practical difference in these cases.
notable other differences:
- we detect veth presence by checking whether *both* ends are present,
rather than just one. We deliberately continue to (and fail in) the
veth creation if one end already exists. This can only happen when
we've stumbled across a different interface, since a veth end cannot
exist independently. So it is right to treat this as an error.
- init_bridged_fastdp invokes add_iface_bridge instead of duplicating
what that does. Also makes for nice coherence with the
add_iface_fastdp it is invoking too.
2016-02-09 19:22:14 +00:00
Adam Harrison
2bfc86e7b2
Cleanup attach-bridge iptables rule
2016-02-09 16:51:04 +00:00
Adam Harrison
36ee8bacb0
Remove all vethwe* interfaces in reset
2016-02-09 16:48:03 +00:00
Matthias Radestock
1bb1108b91
tiny refactor: use ${CONTAINER_IFNAME} for name construction
2016-02-09 16:40:58 +00:00
Matthias Radestock
a77201bf77
Merge pull request #1955 from weaveworks/weave-attach-bridge
...
'attach-bridge' feature to link an existing bridge netdev with the weave bridge
2016-02-09 15:45:28 +00:00
Adam Harrison
a3d842bf4a
Implement attach-bridge
2016-02-09 15:20:11 +00:00
Matthias Radestock
98d76e1099
Merge pull request #1941 from weaveworks/issues/1873-check-running-master
...
Improve visibility of startup problems
Fixes #1873 .
2016-02-04 16:50:50 +00:00
Matthias Radestock
f2a1b3829d
tweak: consistency
2016-02-04 16:19:29 +00:00
Bryan Boreham
1d3c80ab49
Merge pull request #1944 from weaveworks/issues/1940-remove-proxy-weaveps-dep
...
Use netlink instead of shelling out to `weave ps`
2016-02-04 13:45:58 +00:00
Bryan Boreham
38013d2f41
Kill zombies
2016-02-04 12:52:16 +00:00
Adam Harrison
65c48707f6
Use netlink instead of shelling out to weave ps
2016-02-04 12:51:18 +00:00
Matthias Radestock
ae725e333a
make plugin pay attention to WEAVE_HTTP_ADDR
2016-02-03 11:54:05 +00:00
Matthias Radestock
dde244160b
make proxy pay attention to WEAVE_HTTP_ADDR
2016-02-03 11:28:38 +00:00
Matthias Radestock
fdd006022d
make weave control address configurable
2016-02-02 21:38:02 +00:00
Matthias Radestock
e3c19d6414
get rid of container_ip
...
We already know what the weave container IP is, since now it runs in
the host netns.
2016-02-02 20:48:49 +00:00
Matthias Radestock
b1e6bc2929
Always use host netns
...
which allows us to get rid of port mappings and a whole bunch of other
code.
2016-02-02 20:48:49 +00:00
Matthias Radestock
faa7bad8d8
refactor with_container_netns
...
make it set CONTAINER_NETNS instead of CONTAINER_PID (well, it still
sets the latter, but not for effect), which reduces coupling.
2016-02-02 13:37:17 +00:00
Matthias Radestock
710c13ced9
correct typo in comment
2016-02-02 13:02:33 +00:00
Adam Harrison
6bd8da905e
Refactor: uniform use of weave_container_addresses
2016-02-02 11:30:36 +00:00
Adam Harrison
839f534350
Merge branch '1.4'
2016-02-01 15:30:51 +00:00
Matthias Radestock
18c26e9fbb
don't set the interface 'up' before it is fully configured
...
This was causing container entrypoints to execute too early,
e.g. before the interface had been given an IP address. But only when
running with --no-multicast-route, since otherwise weavewait is
waiting for the multicast route to appear.
Fixes #1942 .
2016-02-01 12:04:15 +00:00
Bryan Boreham
0a4b3a04ba
Wait for plugin status via unix socket
2016-02-01 10:11:46 +00:00
Matthias Radestock
f8fa37c895
Merge branch '1.4'
2016-01-30 11:16:30 +00:00
Matthias Radestock
b54efbde69
fix typo in comment
2016-01-30 11:15:57 +00:00
Bryan Boreham
c2a869491f
Check State.Restarting as well as State.Running
2016-01-29 17:41:02 +00:00
Bryan Boreham
a750ef8033
Don't check if container is running when we only want its ID.
...
This avoids trying to decide if "restarting" is as good as "running".
In wait_for_status we now explitly check_running, and
in dns_add/remove we add an extra check_running test.
2016-01-29 17:41:02 +00:00
Adam Harrison
81c49e6005
Merge pull request #1938 from weaveworks/issues/1827-stopped-version
...
Check if container is running before using its image to ask for version
2016-01-29 15:57:15 +00:00