Matthias Radestock
4d05775e11
Merge branch '1.4'
2016-01-21 11:30:05 +00:00
Matthias Radestock
a2ff7e5981
Merge pull request #1919 from weaveworks/issues/1900-dont-stop-stoppin
...
Warn, don't error, if unable to remove network in 'weave stop'
Fixes #1900 .
2016-01-21 11:22:21 +00:00
Bryan Boreham
7ec17ab2ef
Merge branch '1.4'
2016-01-21 10:18:01 +00:00
Bryan Boreham
e47360f8dc
Warn, don't error, if unable to remove network in 'weave stop'
2016-01-20 16:18:09 +00:00
Adam Harrison
14944da396
Ignore stderr in proxy_addrs
2016-01-20 14:24:59 +00:00
Matthias Radestock
e631fb0d69
derive the bridge MAC from the system (aka BIOS) UUID
...
...if possible. This provides a stable peer identity across
reboots. If we cannot determinbe the system UUID then we revert to a
random MAC, as before.
Fixes #901 .
2016-01-18 14:56:55 +00:00
Matthias Radestock
31b303a419
move plugin network creation into weaveutil
...
Note that we remove the ability to set the weavemesh network name, or
disabling it altogether. This was always poorly support, since the
removal operation only ever operated on the default name. The option
was also not listed in the usage, though it was in the docs.
2016-01-15 08:52:57 +00:00
Matthias Radestock
9578798ec0
move plugin network removal into weaveutil
...
This does require starting containerised weaveutil with docker.sock
volume mounts.
2016-01-15 07:58:21 +00:00
Adam Harrison
28561237ab
Merge branch '1.4'
2016-01-13 11:10:30 +00:00
Bryan Boreham
b055c9a4a2
Fool-proofing
2016-01-13 10:33:49 +00:00
Matthias Radestock
799160c5c2
remove "encryption -> pcap" cruft
...
As of e12dbb460 (#1758 ) we no longer force the usage of pcap when
encryption is enabled. Hence...
- we no longer need to figure out whether the router was started with
a password when re-attaching it from the proxy. We therefore remove
the code for that.
- there is no longer any mode in which we pass both `--datapath` and
`--iface` options to the router. Previously this would only happen
when encryption was enabled and the only overlay used for
connections was sleeve. It is not clear what the behaviour is when
these conditions do not hold, so, to be safe, we prevent the
specification of both flags.
2016-01-13 10:27:25 +00:00
Bryan Boreham
3daceac668
Allow pre-existing plugin on 'weave launch-plugin'
2016-01-13 10:05:02 +00:00
Bryan Boreham
517a2e0e0a
Fix nonzero exit code for a pre-existing plugin on launch;
...
do this purely for the 'plugin running' case, not 'restarting' etc.
2016-01-12 17:06:38 +00:00
Bryan Boreham
bb8c7c599c
Revert "don't launch anything when plugin is running"
...
This reverts commit 3ade796e8d .
2016-01-12 16:51:49 +00:00
Bryan Boreham
2f885a7906
Reclaim all addresses on restart
2016-01-12 14:38:44 +00:00
Bryan Boreham
7985e43e68
Add 'weave restart' command
2016-01-12 14:38:44 +00:00
Bryan Boreham
987d89632d
Merge pull request #1847 from weaveworks/1613-weaveutil
...
extract script utilities into single binary; LGTM
2016-01-07 18:53:25 +00:00
Matthias Radestock
64a017c972
Merge branch '1.4'
2016-01-07 14:36:08 +00:00
Matthias Radestock
e4295a2da9
don't attach rewrite_etc_hosts helper container to weave
...
...since that is a) inefficent and b) can block when IPAM hasn't had
consensus.
We can only end up in this situation when DOCKER_HOST is pointing at
the weave proxy and we are running `weave run|attach` with
`--local`. So it's very much an edge case.
Fixes #1858 .
2016-01-07 14:32:52 +00:00
Matthias Radestock
216a0fe4fc
refactor: WEAVE_CIDR=none is redundant when --net=host
2016-01-07 14:29:51 +00:00
Matthias Radestock
70bfcd033b
Merge branch '1.4'
2016-01-04 11:14:28 +00:00
Matthias Radestock
80770d39e5
oops
2016-01-04 10:53:41 +00:00
Matthias Radestock
beb15fa32c
don't fail weave launch when plugin is disabled
...
Fixes #1851 .
2016-01-04 10:35:44 +00:00
Matthias Radestock
c3e6669d18
Merge branch '1.4'
2016-01-03 16:45:41 +00:00
Matthias Radestock
7660ad761a
oops
...
I broke this in 370212609 .
Fixes #1848 .
2016-01-03 16:42:39 +00:00
Matthias Radestock
d010000583
fall back to invoking weaveutil in a container
...
As a result, `weave --local ...` now runs both netcheck and
docker-tls-args.
2016-01-02 14:13:29 +00:00
Matthias Radestock
419f2ff71b
move fastdp helpers into weaveutil
...
so the weave script can invoke them w/o having to run a container
2016-01-02 14:00:44 +00:00
Matthias Radestock
4ebcd355f6
move docker_tls_args into weaveutil
...
and also give users a clue what went wrong when docker isn't running
2016-01-02 14:00:44 +00:00
Matthias Radestock
ec872d7b45
move netcheck into weaveutil
2016-01-02 14:00:44 +00:00
Matthias Radestock
d59594c6b0
Revert "refactor: pass procfs location to docker_tls_args on command line"
...
changed my mind
This reverts commit be8260ae79 .
2016-01-02 10:50:13 +00:00
Matthias Radestock
4a6b72c649
Revert "cosmetic"
...
changed my mind
This reverts commit 20a8488a15 .
2016-01-02 10:49:22 +00:00
Matthias Radestock
20a8488a15
cosmetic
...
PROCFS is always set
2016-01-02 00:14:18 +00:00
Matthias Radestock
be8260ae79
refactor: pass procfs location to docker_tls_args on command line
...
...rather than via an env var. This is cleaner.
2016-01-01 23:52:46 +00:00
Matthias Radestock
9c31de9cb9
refactor: replace some 'if's with && and || expressions
2015-12-31 15:36:18 +00:00
Matthias Radestock
c1e8c9c537
Merge branch '1.4'
2015-12-31 13:26:55 +00:00
Matthias Radestock
c8ff2de3b3
properly deal with unavailable docker server api version
...
Fixes #1845 .
2015-12-31 12:51:16 +00:00
Matthias Radestock
24d1c73012
Merge branch '1.4'
2015-12-31 12:32:30 +00:00
Matthias Radestock
24a2e43547
Merge pull request #1841 from weaveworks/1840-weave-stop-plugin-complaint
...
don't complain in `weave stop` when plugin is not enabled
Fixes #1840 .
2015-12-31 12:32:05 +00:00
Matthias Radestock
2816899543
refactor: extract helper to invoke fastdp functions from script
2015-12-31 12:19:51 +00:00
Matthias Radestock
394d2add68
Merge branch '1.4'
2015-12-31 10:59:10 +00:00
Matthias Radestock
a9d212c888
don't fail on missing docker_tls_args
...
instead just don't auto-detect TLS args in that case.
This makes `weave --local launch` work (again).
Fixes #1844 .
2015-12-31 10:43:46 +00:00
Matthias Radestock
c1b1276aaf
refactor: simplify
2015-12-31 10:16:37 +00:00
Matthias Radestock
370212609c
Show expected error message when docker_tls_args fails.
...
And also make the error message more meaningful.
Fixes #1843 .
2015-12-31 10:05:41 +00:00
Matthias Radestock
159bad54b0
prettier usage
2015-12-31 01:42:01 +00:00
Matthias Radestock
1cc7ca18ba
Merge branch '1.4'
2015-12-31 01:11:06 +00:00
Matthias Radestock
281937cf82
document weave launch-router --trusted-subnets
...
and eliminate duplication
Fixes #1842 .
2015-12-31 01:09:51 +00:00
Matthias Radestock
d11b6e8075
don't complain in weave stop when plugin is not enabled
2015-12-30 23:40:27 +00:00
Matthias Radestock
27f477a075
refactor: introduce a small helper so we don't repeat ourselves
2015-12-30 22:40:30 +00:00
Matthias Radestock
82ac69be4e
cosmetic
2015-12-30 22:23:16 +00:00
Matthias Radestock
c7c669fd11
make eval $(weave env) idempotent
...
so that `weave $(env --restore)` does the right thing regardless of
how many times `eval $(weave env)` was invoked previously.
Fixes #1824 .
2015-12-23 09:08:56 +00:00