summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-01-25 15:28:43 -0800
committerJoffrey F <joffrey@docker.com>2017-01-25 15:28:43 -0800
commit3e5bb7b0e6ae6286451f8af8cc717bd995709c13 (patch)
treea7e081b153f0d0dfd80bedcb235bd8da7a0c0835 /docker
parent39deace7c62e3ebfd1a69beb9ac78e6aa7038b57 (diff)
downloaddocker-py-3e5bb7b0e6ae6286451f8af8cc717bd995709c13.tar.gz
Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-init
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/models/swarm.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/models/swarm.py b/docker/models/swarm.py
index adfc51d..d3d07ee 100644
--- a/docker/models/swarm.py
+++ b/docker/models/swarm.py
@@ -29,7 +29,7 @@ class Swarm(Model):
return self.attrs.get('Version').get('Index')
def init(self, advertise_addr=None, listen_addr='0.0.0.0:2377',
- force_new_cluster=False, swarm_spec=None, **kwargs):
+ force_new_cluster=False, **kwargs):
"""
Initialize a new swarm on this Engine.
@@ -87,11 +87,11 @@ class Swarm(Model):
)
"""
- init_kwargs = {}
- for arg in ['advertise_addr', 'listen_addr', 'force_new_cluster']:
- if arg in kwargs:
- init_kwargs[arg] = kwargs[arg]
- del kwargs[arg]
+ init_kwargs = {
+ 'advertise_addr': advertise_addr,
+ 'listen_addr': listen_addr,
+ 'force_new_cluster': force_new_cluster
+ }
init_kwargs['swarm_spec'] = SwarmSpec(**kwargs)
self.client.api.init_swarm(**init_kwargs)
self.reload()