Bryan Boreham
2e54efe34d
Stop the proxy last, so we can stop the router
...
before being unable to communicate with docker
when $DOCKER_HOST is pointing at the proxy
2015-10-22 15:45:54 +01:00
David Wragg
85dad58cfe
Pass --privileged for the temporary container in rewrite_etc_hosts
...
Otherwise we run into selinux issues on fedora23 (and probably other
selinux distros).
2015-10-22 11:44:17 +01:00
Matthias Radestock
2ef9cc6a1c
start temporary containers without networking when possible
...
This is more efficient and TRTTD
Closes #1572 .
2015-10-21 16:52:19 +01:00
Matthias Radestock
2357b69a5f
nicer interface name
...
and more likely to be ignored by NetworkManager
Closes #1567 .
2015-10-21 16:22:16 +01:00
Adam Harrison
720862dafb
Merge pull request #1562 from dpw/fdp-create-bridge
...
'weave --local create-bridge' is not compatible with fastdp
2015-10-20 16:37:20 +01:00
David Wragg
5120b4b468
'weave --local create-bridge' is not compatible with fastdp
2015-10-20 16:34:50 +01:00
Adam Harrison
c5f5d4543e
Merge pull request #1518 from weaveworks/401-reattach-weave2
...
Get proxy to re-attach weave router if it restarts
2015-10-20 15:31:13 +01:00
Adam Harrison
342b3d3d08
Merge pull request #1557 from weaveworks/issues/1497
...
Add container FQDN to /etc/hosts
2015-10-20 11:22:22 +01:00
Alvaro Saurin
f04ae91c82
Add container FQDN to /etc/hosts
2015-10-19 21:51:38 +02:00
Bryan Boreham
bb5515113f
Make attach-router work in fastdp+encryption case
2015-10-19 15:49:07 +00:00
Bryan Boreham
c09d84efc6
Move setup_router_iface call so we don't kill an already-running router on attach-router
2015-10-19 15:49:07 +00:00
Bryan Boreham
2a99a2a597
Don't fail if the arg we're looking for isn't there
2015-10-19 15:47:44 +00:00
Bryan Boreham
284d78c6b2
Update fetch_router_args in line with changes elsewhere
2015-10-19 15:47:44 +00:00
Bryan Boreham
b8b5fb9eae
Review feedback
2015-10-19 15:47:43 +00:00
Bryan Boreham
a1bbb06e2f
Don't need depreciation warnings on internal-only command
2015-10-19 15:46:47 +00:00
Bryan Boreham
a87cc5c3b1
Get the proxy to re-attach the weave router if it sees it restart
2015-10-19 15:46:47 +00:00
Matthias Radestock
5ff740cddc
cosmetic
2015-10-19 15:43:49 +01:00
Bryan Boreham
2f4d460c04
Merge pull request #1517 from weaveworks/1385-non-container-dns-add
...
LGTM. Fixes #1385
2015-10-19 12:52:09 +01:00
Matthias Radestock
d5401ae3cb
Merge pull request #1550 from dpw/weave2-eexist
...
Don't fail in launch-router if weave2 already exists
Fixes #1548 .
2015-10-16 21:36:45 +01:00
David Wragg
3482a7f1f1
Don't fail in launch-router if weave2 already exists
...
And delete weave2 on stop-router.
2015-10-16 20:59:06 +01:00
David Wragg
23762e0639
Move repeated 'stop' code into functions
2015-10-16 20:55:44 +01:00
Alvaro Saurin
0d165487b8
Rewrite /etc/hosts in the containers
2015-10-16 11:47:07 +02:00
Matthias Radestock
207ee8667b
Merge pull request #1538 from dpw/detect-no-fastdp-mismatch
...
signal mismatches between WEAVE_NO_FASTDP and the bridge type
Fixes #1533 .
2015-10-14 17:17:35 +01:00
David Wragg
5984ed921e
signal mismatches between WEAVE_NO_FASTDP and the bridge type
2015-10-14 16:33:23 +01:00
Matthias Radestock
8cfc8b3132
Merge pull request #1528 from weaveworks/weave-env-bug
...
[proxy] Fix bug in weave env/config when passing multiple -H flags
Fixes #1527
2015-10-14 15:50:42 +01:00
Paul Bellamy
fd07f59d16
[proxy] Fix bug in weave env/config when passing multiple -H flags
...
The echo in proxy_addr was not preserving newlines, so the multiple
addrs were all getting returned
2015-10-14 11:58:10 +01:00
Adam Harrison
827bcd898e
Merge pull request #1438 from weaveworks/fdp
...
Fast datapath
2015-10-13 10:34:49 +01:00
Matthias Radestock
54a4add40f
cosmetic
2015-10-13 09:02:03 +01:00
David Wragg
b56ff7678c
Make code coverage work through the proxy
...
Previously, the proxy would run the weave script in ways that did
not run the weaver executable. Now they can. This is a problem because
of the contortions involved in using golang's code coverage support
in the integration tests, which require the weaver command line args to
be slightly mangled.
2015-10-12 21:27:11 +01:00
David Wragg
431197042d
Weave script changes to enable fast datapath
...
This means:
* The 'weave' netdev is an OVS datapath
* The weave router container runs with --net=host in order to access
the datapath.
* The MTU is set to a smaller value, to allow vxlan encapsulation.
Setting the WEAVE_NO_FASTDP environment variable disables these
things, effectively running the router without fast datapath. It is
an environment variable rather than an option to 'weave launch'
because it takes effect in create_bridge, which is called from many
subcommands, and it doesn't seem practical to add option processing to
all of them.
2015-10-12 21:27:11 +01:00
Matthias Radestock
6b321e4d02
associate non-container dns entries with 'weave:extern'
...
...instead of the weave container. This is cleaner.
'weave:extern' because typically these entries will refer to external
(non-weave) IP addresses. And because it's the same length as
'weave:expose', which is desirable for 'weave status dns' output.
2015-10-08 22:21:38 +01:00
Matthias Radestock
e6b17c701d
dns-{add,remove} can add/remove non-container DNS records
...
...by omitting the container name/id
Fixes #1385 .
2015-10-08 17:37:35 +01:00
Matthias Radestock
e756f07cad
Merge branch '1.1'
2015-10-06 16:25:45 +01:00
Matthias Radestock
0ef548b9c9
prevent dropping of large multicast packets
...
Fixes #1507 .
2015-10-06 16:25:02 +01:00
Ilya Dmitrichenko
8a62d13cee
Merge pull request #1500 from weaveworks/1443-dont-assume-docker
...
allow router exe to be run w/o access to Docker
2015-10-06 14:28:26 +01:00
Matthias Radestock
1da24c68ca
don't allocate IPs on 'detach' and 'hide'
...
Instead of POSTing to IPAM in order to obtain IPs, we GET existing
IPs. We ignore 404s, so detaching/hiding remains idempotent.
Fixes #860
2015-10-06 12:35:55 +01:00
David Wragg
bcf71c0fee
Merge branch '1.1'
2015-10-04 20:25:31 +01:00
Matthias Radestock
37ea8a28ad
strip off @... from interface names returned by ip link show
...
Apparently kernel 4.2 adds these, which breaks `weave reset` when we
pass the names to `ip link del'.
Fixes #1364 .
2015-10-04 15:43:55 +01:00
Matthias Radestock
a689317696
make 'no Docker API access' the default in the exe
...
...and instead enable it in the script, via the (better named) option.
2015-10-03 17:52:57 +01:00
Matthias Radestock
35b2968b60
Merge branch '1.1'
2015-10-03 17:20:21 +01:00
Matthias Radestock
dac932f553
fix multi-ip attach
...
This got broken in f7dfe9d
2015-10-03 17:09:25 +01:00
Paul Bellamy
827ba446ab
Remove /var/run mount from exec_remote. Proxy uses /var/run/weave/weave.sock
...
It was left in for backwards compatibility, in 1.1.
2015-10-01 15:52:29 +01:00
Matthias Radestock
cdd107b06b
Merge branch '1.1'
...
Conflicts:
weave
2015-10-01 12:04:44 +01:00
Paul Bellamy
29bfd77855
[proxy] don't mount /var/run into the proxy, so the kernel can GC veth pairs
2015-10-01 11:43:13 +01:00
Matthias Radestock
5b1d0c55a0
Merge pull request #1474 from weaveworks/1472-weave-env-debug
...
use a container-local unix socket to get the address, instead of logs
Fixes #1453 . Fixes #1472 .
2015-09-29 11:04:41 +01:00
Matthias Radestock
58515ca36e
make weave(proxy) startup death message more generic
...
...in order to account for `docker logs` not working due to custom
logging drivers.
Partially undoes #958 . Partially fixes #1453 .
2015-09-29 11:02:05 +01:00
Matthias Radestock
47c97e8191
refactor: remove some code duplication
2015-09-28 16:10:43 +01:00
Paul Bellamy
d704ba175f
[proxy] use a container-local unix socket to get the address, instead of logs
2015-09-28 16:08:25 +01:00
Matthias Radestock
356d06915b
refactor weave script http calls
...
- inline http_call into call_weave
- rename http_call_ip to http_call
- make http_call take the IP & port as one single "address" argument
instead of separate args
2015-09-28 12:43:09 +01:00
Matthias Radestock
e07b18bb18
Merge branch '1.1'
2015-09-24 12:08:13 +01:00