8000 Support requesting a specific IP from the plugin by bboreham · Pull Request #1916 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Support requesting a specific IP from the plugin #1916

Merged
merged 2 commits into from
Jan 29, 2016
Merged

Support requesting a specific IP from the plugin #1916

merged 2 commits into from
Jan 29, 2016

Conversation

bboreham
Copy link
Contributor

Fixes #1734

@bboreham bboreham force-pushed the issues/1734-fixed-ip branch from 90cf117 to c72727b Compare January 22, 2016 14:07
@bboreham
Copy link
Contributor Author

Rebased

@awh awh self-assigned this Jan 25, 2016
awh
awh reviewed Jan 25, 2016
View reviewed changes
plugin/ipam/driver.go
if err := i.weave.ClaimIP("_", address); err == nil {
ip = &net.IPNet{IP: address, Mask: subnet.Mask}
} else {
Log.Debugln("ClaimIP returned", err, "; allocating new address")

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@bboreham bboreham assigned bboreham and unassigned awh Jan 27, 2016
@bboreham bboreham changed the title Support requesting a specific IP from the proxy Support requesting a specific IP from the plugin Jan 27, 2016
@bboreham bboreham force-pushed the issues/1734-fixed-ip branch from c72727b to 02a3e30 Compare January 27, 2016 11:15
@bboreham
Copy link
Contributor Author

I clarified the intended meaning, and removed the word "preferred" from Docker's code.

But there is a new problem: requesting the same address twice does not fail.

Currently we can't easily do a smoke-test because the --ip flag only comes in with Docker 1.10

@bboreham bboreham force-pushed the issues/1734-fixed-ip branch from 02a3e30 to 610a90c Compare January 27, 2016 12:11
@bboreham
Copy link
Contributor Author

Fixed the problem that requesting the same address twice did not fail.

@bboreham bboreham assigned awh and unassigned bboreham Jan 27, 2016
@awh awh added this to the 1.5.0 milestone Jan 29, 2016
awh added a commit that referenced this pull request Jan 29, 2016
@awh
Merge pull request #1916 from /issues/1734-fixed-ip
4f97b3a 
Support requesting a specific IP from the plugin
@awh awh merged commit 4f97b3a into master Jan 29, 2016
7603
@awh awh deleted the issues/1734-fixed-ip branch January 29, 2016 14:22
@bboreham bboreham mentioned this pull request Mar 14, 2016
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@awh awh

Labels
None yet
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.
2 participants
@bboreham @awh
0