New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'weave launch' without CIDR #154

Merged
merged 12 commits into from Oct 27, 2014

Conversation

Projects
None yet
2 participants
@rade
Copy link
Member

rade commented Oct 24, 2014

It turns out we don't need a CIDR in weave launch.
The ethwe interface in the weave container does not need an IP address/netmask since we only use it to perform captures and injects. So the only place weave launch really needed the CIDR was for setting up masquerading. But that is just an enabler for weave expose, so it's actually more logical to configure masquerading there, and only for the specific subnet exposed.

For backward compatibility, now weave launch swallows any supplied CIDR and shows a warning when it does so.

Closes #130

rade added some commits Oct 24, 2014

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.
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.

rade added some commits Oct 25, 2014

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
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'.

@dpw dpw self-assigned this Oct 27, 2014

@dpw dpw merged commit 4b89883 into weaveworks:master Oct 27, 2014

@rade rade unassigned dpw Apr 8, 2015

@rade rade modified the milestone: ancient Apr 18, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment