Matthias Radestock
9d36bb3289
fix typo
2014-11-06 22:14:50 +00:00
Matthias Radestock
eacc14dfe2
tidying: remove superfluous var
2014-11-06 22:05:14 +00:00
Matthias Radestock
a16c6acc32
properly detach containers from network on 'weave reset'
...
since otherwise we are leaving veth pairs behind which a) breaks a
subsequent 'weave attach', and b) runs contrary to 'weave reset's
stated purpose of removing all traces of weave.
NB: This does yank the ethwe interface from the containers.
Fixes #164
2014-11-06 22:02:24 +00:00
Matthias Radestock
57c17b6cef
use /dev/urandom instead of /dev/random to avoid blocking
...
...since in some typical deployment scenarios, e.g. small, minimal
VMs, not enough entropy may be available.
Fixes #170 .
2014-11-06 21:46:12 +00:00
David Wragg
0dd9abdd57
Merge pull request #168 from bboreham/167_fix_dns
...
Fix some small issues with weavedns
2014-11-05 18:16:37 +00:00
Bryan Boreham
91b6719924
Fetch docker version, to check things are working
2014-11-05 16:57:59 +00:00
Bryan Boreham
5d8045f5ee
Factor out error check
2014-11-05 16:57:24 +00:00
Bryan Boreham
a0a5921148
Check for error return from AddEventListener
2014-11-05 12:44:39 +00:00
Bryan Boreham
d85071ce4f
Run weavedns with --privilege to work on more locked-down platforms
2014-11-05 12:43:54 +00:00
Bryan Boreham
7b302f5ef0
Add tail -1 to work round Docker logging to wrong place
2014-11-05 12:33:17 +00:00
Bryan Boreham
8229c0617c
Fix small error in curl arguments
2014-11-05 12:33:05 +00:00
Bryan Boreham
d66c8e440c
Change IRC link to botbot.me
2014-11-04 16:45:29 +00:00
Bryan Boreham
4217a112b2
Added IRC link
2014-11-04 12:08:38 +00:00
Bryan Boreham
0d3de8bd38
Emphasise the ways in which IP addresses must not conflict
2014-11-04 12:08:38 +00:00
Michael Bridgen
97c31f0a15
Merge pull request #163 from squaremo/integrate_weavedns
...
Integrate weavedns
2014-11-04 12:00:55 +00:00
Michael Bridgen
01079737fa
Publish the weaveDNS docker image too
2014-11-04 11:54:45 +00:00
Michael Bridgen
b78255f517
Fix typos and grammaros in weavedns README
2014-11-03 19:01:19 +00:00
Michael Bridgen
27beebf5d5
Factor out the wait-for-interface code
2014-11-03 17:47:16 +00:00
Michael Bridgen
8ce6c4aba3
Rewrite weaveDNS README to account for weave integration
2014-11-03 17:34:56 +00:00
Michael Bridgen
55c8b80075
Reform rest_call
...
First, it's not ReST, so rename to http_call; second, separate the
port into its own argument and put the values in variables; third,
replace the container names with the appropriate variables.
2014-10-31 13:29:32 +00:00
Michael Bridgen
67dfc4211c
No need for this Makefile now
2014-10-30 11:38:17 +00:00
Michael Bridgen
08a0cf3442
Merge branch 'master' into integrate_weavedns
...
Conflicts:
weave
2014-10-29 16:28:54 +00:00
Michael Bridgen
7729f6d742
Realign usage message
2014-10-29 15:19:48 +00:00
Michael Bridgen
b47e819485
Don't include routing_prefix in calls from script
...
I took subnets out of the DNS code.
2014-10-29 14:52:03 +00:00
Bryan Boreham
05921833a3
Launch weavedns and update it on run, start, attach and detach
...
Conflicts:
weave
2014-10-29 14:20:24 +00:00
Bryan Boreham
f56700a032
Factor out routine to check if a container is already running
...
Conflicts:
weave
2014-10-29 14:20:24 +00:00
Bryan Boreham
75deacaed0
Factor out REST call
...
Conflicts:
weave
2014-10-29 14:20:24 +00:00
Michael Bridgen
44cac7fb40
Build weavedns bin and container in the Makefile
2014-10-29 14:20:24 +00:00
rade
a88bb68447
Merge pull request #147 from bboreham/138_weave_ps
...
Add command `weave ps`
2014-10-29 13:45:07 +00:00
Bryan Boreham
8ab9bad31d
cosmetic
2014-10-29 12:34:28 +00:00
Bryan Boreham
72b62b4ffc
Add weave ps to usage
2014-10-29 12:34:09 +00:00
Michael Bridgen
190e708045
Merge branch 'arrange_for_merge' of ../weavedns into integrate_weavedns
...
This pulls the weavedns repo commits into the weave repo, for merging
into the main code base.
2014-10-29 12:25:20 +00:00
Michael Bridgen
a384e0bc16
Move more weavedns things out of the way
2014-10-29 12:23:18 +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
Michael Bridgen
747d48749d
Ignore compiled binary
2014-10-29 11:44:07 +00:00
Michael Bridgen
822ec90606
Rename weavedns package to nameserver, and fix up
2014-10-29 11:41:58 +00:00
Bryan Boreham
52a4fe545e
Add mac address to weave ps output
2014-10-29 11:39:12 +00:00
Michael Bridgen
8469fea215
Move files around in preparation for melding into weave code
...
* library code will go in weave/nameserver/
* main.go for the server goes in weavedns/ with the containerising
2014-10-29 11:34:56 +00:00
Bryan Boreham
aed3fec3e4
Merge branch 'master' into 138_weave_ps
...
Conflicts:
weave
2014-10-29 11:19:03 +00:00
Michael Bridgen
fdcb960cdd
Don't export sendResponse, and pay attention to its retval
2014-10-28 17:23:03 +00:00
Michael Bridgen
03f766bb95
test.Log;test.Fail -> test.Fatal, and use checkError
...
(in tests)
2014-10-28 17:15:36 +00:00
Michael Bridgen
48328dec50
Change logging config to match weave
2014-10-28 16:52:43 +00:00
Michael Bridgen
b3489f6ec1
Move the handler function closer to its use
2014-10-28 15:39:50 +00:00
Michael Bridgen
96ce10a4d5
Use compact if-with-assign statements where scoping allows
2014-10-28 15:38:53 +00:00
Michael Bridgen
126c36cffb
Extended makeDNSReply to PTR replies too
2014-10-28 14:46:29 +00:00
Michael Bridgen
5bb6c85565
Move DNS utils into their own file
2014-10-28 11:48:51 +00:00
Michael Bridgen
a5869e2090
Use constant for TTL
2014-10-28 11:10:59 +00:00
Michael Bridgen
548039db08
No need to give defaults in docstrings for options
...
The usage message will include them anyway.
2014-10-28 10:59:30 +00:00