Bryan Boreham
72b62b4ffc
Add weave ps to usage
2014-10-29 12:34:09 +00:00
Bryan Boreham
c749427de5
cosmetic
2014-10-29 11:48:23 +00:00
Bryan Boreham
d56ac73732
Inline weave ps function
2014-10-29 11:47:23 +00:00
Bryan Boreham
fe2d1a3699
CONTAINER_IFNAME rather than ethwe
2014-10-29 11:44:20 +00:00
Bryan Boreham
52a4fe545e
Add mac address to weave ps output
2014-10-29 11:39:12 +00:00
Bryan Boreham
aed3fec3e4
Merge branch 'master' into 138_weave_ps
...
Conflicts:
weave
2014-10-29 11:19:03 +00:00
Michael Bridgen
765bfbb49d
Merge pull request #159 from rade/140_weave_connect
...
add `weave connect` to dynamically add peers to running router
2014-10-27 14:47:32 +00:00
Matthias Radestock
1b9dbad15f
cosmetic
2014-10-27 14:34:59 +00:00
Matthias Radestock
741f4616a4
Merge branch 'master' into 140_weave_connect
...
Conflicts:
weave
2014-10-27 14:33:26 +00:00
Matthias Radestock
4b8988346f
cosmetic
2014-10-27 14:08:54 +00:00
Matthias Radestock
6393e545ae
introduce 'weave connect' to connect a running router to other peers
...
Getting this to work with 'wget' is just too cumbersome especially
when it comes to getting the error message out. So 'curl' only.
2014-10-27 09:15:14 +00:00
Matthias Radestock
acbabc4f9e
s/StatusPort/HttpPort
...
since we are adding functionality other than status
2014-10-27 08:22:22 +00:00
Matthias Radestock
fad5846946
refactor: extract basic container/bridge connection establishment
...
Note that we do not mark the interface in the container as 'up' here
since some callers, in particular 'attach', add CIDRs to the
interface, and some programs rely on 'up' implying 'has IP address'.
2014-10-26 12:13:28 +00:00
Matthias Radestock
de82adce46
Merge branch 'master' into 130_launch_without_ip
...
Plus a bit of a refactoring, to avoid duplicating the CIDR
regexp. Plus some minor cosmetic tweaks.
Conflicts:
README.md
weave
2014-10-25 22:26:31 +01:00
Matthias Radestock
d8bea832d3
validate CIDR
...
This isn't meant to be precise but supposed to guard against silly
mistakes.
Closes #116 .
2014-10-25 22:04:36 +01:00
Matthias Radestock
007b68c206
explain that peer can be specified as fqdn and contain optional port
...
Closes #137 .
2014-10-25 19:51:06 +01:00
Matthias Radestock
e9c5b2c3ea
refactor: extract weave ports and container name into constants
2014-10-25 19:42:52 +01:00
Matthias Radestock
e265f04182
cosmetic: remove trailing whitespace
2014-10-25 17:13:44 +01:00
Matthias Radestock
ce631e7f28
stricter param count checking
2014-10-24 16:56:58 +01:00
Matthias Radestock
76a974f88b
refactor: maintain abstraction
2014-10-24 16:07:06 +01:00
Matthias Radestock
d3ba6746a5
backward compatibility
2014-10-24 15:36:54 +01:00
Matthias Radestock
9ec7422221
Merge branch 'master' into 130_launch_without_ip
...
Conflicts:
weave
2014-10-24 15:08:21 +01:00
rade
a1c4038ac7
Merge pull request #153 from rade/91_simplify_multicast_detection
...
remove explicit multicast detection
Closes #91
2014-10-24 14:34:49 +01:00
Matthias Radestock
83464a38eb
remove explicit multicast detection
...
We don't need. Multicast addresses never appear as sources and hence
never end up in the peer_cache. And the router always broadcasts
frames with destination addresses that aren't in the peer cache.
2014-10-24 14:30:58 +01:00
David Wragg
ded7d3a991
Merge pull request #152 from rade/weave_script_tidy
...
various simplifications and tidying up in weave script
2014-10-24 14:26:35 +01:00
Matthias Radestock
dba8760187
update README
2014-10-24 13:43:15 +01:00
Matthias Radestock
00a4a5e056
refactor: simplify multicast route addition in 'attach'
2014-10-24 13:15:15 +01:00
Matthias Radestock
560cbabb54
refactor: simplify 'attach'
...
Move the interface into the container network NS asap, which
simplifies error handling.
2014-10-24 13:13:34 +01:00
Matthias Radestock
de96742935
refactor: remove add_nat_rule
...
it did too little to be worthwhile
2014-10-24 13:03:28 +01:00
Matthias Radestock
093b23fa83
refactor: it's not an IPADDR but a CIDR
2014-10-24 12:59:47 +01:00
Matthias Radestock
5b6a892c38
refactor: don't extract param to var and shift unless we have to
2014-10-24 12:57:35 +01:00
Matthias Radestock
6501934a15
make with_container_netns take the container as the first arg
...
and invoke the subsequent command.
This is closer to typical 'with' semantics.
2014-10-24 12:50:29 +01:00
Matthias Radestock
34e240c4a5
remove misleading comment...
...
attach() and detach() are never invoked directly,
plus it's really not that hard to figure out what they do.
2014-10-24 12:49:04 +01:00
Matthias Radestock
579f3469c8
simplify code for attach
2014-10-24 12:30:42 +01:00
Bryan Boreham
9b90e119e5
Say 'name' instead of 'identity' in log and status
2014-10-24 11:38:10 +01:00
Matthias Radestock
7a53efe66c
get error handling right
2014-10-24 11:27:32 +01:00
Matthias Radestock
73f504afd6
Merge branch '130_launch_without_ip' of github.com:rade/weave into 130_launch_without_ip
...
Conflicts:
weave
2014-10-24 10:23:50 +01:00
Matthias Radestock
85787f2d4e
fix 'weave start' post rebase
2014-10-24 10:21:02 +01:00
Matthias Radestock
0adda9eae9
drop IP/network from 'weave launch'
...
plus a whole bunch of other small changes to weave script which I'll
eventually extract into separate commits.
2014-10-24 10:19:22 +01:00
Bryan Boreham
ced7299140
Removed weave ps -v option
2014-10-24 10:14:32 +01:00
Bryan Boreham
e4fe57a02c
Make extra container information optional
2014-10-24 10:14:32 +01:00
Bryan Boreham
f7eeb1f844
Fix issues raised in code review
2014-10-24 10:14:32 +01:00
Bryan Boreham
06adae8fb5
Added weave ps command
2014-10-24 10:14:32 +01:00
Matthias Radestock
46b0cc35f1
drop IP/network from 'weave launch'
...
plus a whole bunch of other small changes to weave script which I'll
eventually extract into separate commits.
2014-10-24 10:11:43 +01:00
Bryan Boreham
988f555a68
Merge pull request #150 from rade/126_weave_start
...
LGTM. Closes #126 , also referenced from #148
2014-10-24 09:30:07 +01:00
Matthias Radestock
070ec0c0e9
add usage
2014-10-23 18:00:29 +01:00
Matthias Radestock
9cc6f9121e
add 'weave start'
2014-10-23 17:55:23 +01:00
Matthias Radestock
041a4c5f6c
don't talk about netmasks
2014-10-23 17:50:38 +01:00
Matthias Radestock
f037865b82
consistency
2014-10-23 17:27:35 +01:00
Matthias Radestock
7778946f96
be more correct / precise about CIDR notation in usage
2014-10-23 17:25:34 +01:00