cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Docker: don't send wrong parameters to client.start()

Browse source 
As part of being updated for the 1.10 API, a couple of parameters were passed to the docker.client.start() command that it doesn't accept. This caused the module to error out if it tried to start any Docker containers. This removes those parameters so the module works again.
This commit is contained in:
Joshua Conner 2014-04-14 15:05:42 -07:00
parent 6ec0e25d1a
commit 0ef288dcc8
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/cloud/docker
View file

@ -566,10 +566,6 @@ class DockerManager:
'links': self.links, 'links': self.links,
} }
if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0:
params['dns'] = self.module.params.get('dns')
params['volumes_from'] = self.module.params.get('volumes_from')
for i in containers: for i in containers:
self.client.start(i['Id'], **params) self.client.start(i['Id'], **params)
self.increment_counter('started') self.increment_counter('started')
@ -677,11 +673,11 @@ def main():
# start/stop containers # start/stop containers
if state in [ "running", "present" ]: if state in [ "running", "present" ]:
# make sure a container with `name` exists, if not create and start it # make sure a container with `name` exists, if not create and start it
if name and "/" + name not in map(lambda x: x.get('Name'), deployed_containers): if name and "/" + name not in map(lambda x: x.get('Name'), deployed_containers):
containers = manager.create_containers(1) containers = manager.create_containers(1)
if state == "present": #otherwise it get (re)started later anyways.. if state == "present": #otherwise it get (re)started later anyways..
manager.start_containers(containers) manager.start_containers(containers)
running_containers = manager.get_running_containers() running_containers = manager.get_running_containers()
deployed_containers = manager.get_deployed_containers() deployed_containers = manager.get_deployed_containers()
@ -690,18 +686,18 @@ def main():
# make sure a container with `name` is running # make sure a container with `name` is running
if name and "/" + name not in map(lambda x: x.get('Name'), running_containers): if name and "/" + name not in map(lambda x: x.get('Name'), running_containers):
manager.start_containers(deployed_containers) manager.start_containers(deployed_containers)
# start more containers if we don't have enough # start more containers if we don't have enough
elif delta > 0: elif delta > 0:
containers = manager.create_containers(delta) containers = manager.create_containers(delta)
manager.start_containers(containers) manager.start_containers(containers)
# stop containers if we have too many # stop containers if we have too many
elif delta < 0: elif delta < 0:
containers_to_stop = running_containers[0:abs(delta)] containers_to_stop = running_containers[0:abs(delta)]
containers = manager.stop_containers(containers_to_stop) containers = manager.stop_containers(containers_to_stop)
manager.remove_containers(containers_to_stop) manager.remove_containers(containers_to_stop)
facts = manager.get_running_containers() facts = manager.get_running_containers()
else: else:
acts = manager.get_deployed_containers() acts = manager.get_deployed_containers()