-
Notifications
You must be signed in to change notification settings - Fork 1.7k
swarm with a custom address pool and subnet size revisited #2261
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
swarm with a custom address pool and subnet size revisited #2261
Conversation
…net size. Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Also corrected a documentation error: the default API version from constants is currently 1.35, not 1.30 as was sometimes listed. Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
The integration tests require restarting the swarm once for each test. I had done so manually with self.init_swarm(force_new_cluster=True) but that wasn't resetting the swarm state correctly. The usual test teardown procedure cleans up correctly. Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Following #2201
Please sign your commits following these rules: $ git clone -b "2200-swarm-default-addr-pool-reviewed" git@github.com:bluikko/docker-py.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842353560464
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f Amending updates the existing PR. You DO NOT need to open a new one. |
docker/api/swarm.py
Outdated
""" | ||
|
||
url = self._url('/swarm/init') | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Remove empty line
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please squash the commits b7d93f6 and 6e21b83 ?
Since the second is just a correction of the first...
Also squash the commits 59d0a8b and a210c31.
And also, you need to sign your commits. Check the message from @GordonTheTurtle :D
@bluikko are you still interested in resolving the requested changes here? Otherwise I can open up a new one. It would be nice to get this feature implemented. |
Indeed it would be a good feature - I made the PR very quickly with plain github, thinking it would be easy (right...). I'm not sure I could squash the commits with github only. I actually gave up trying to manage Docker Swarm with docker-py since the project I am working on has some scheduling pressures. |
This is my ridiculous attempt to address the requests listed in #2201 - since the original submitter has not addressed the three very simple requests by @chris-crone in over 2 months, I decided to take a stab on it.
It is my first attempt with Python and was done very quickly - the changes requested in #2201 were very simple but the
kwargs
might have been my stumbling block... it has been not tested.