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

Rename present to running, add new present state

Browse source 
The new present state just makes sure that a container exists, not that
it's running, although it get started one creation.
This is very useful for data volumes. This also changes the old
present, now running (default) state to only create the container if
it's not found, otherwise it just get started.

See also discussion on mailinglist:
https://groups.google.com/forum/#!topic/ansible-devel/jB84gdhPzLQ

This closes #6395
This commit is contained in:
Johannes 'fish' Ziemke 2014-03-14 11:11:56 +01:00
parent 47bfa8b9eb
commit 32fa21c95f
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
library/cloud/docker
View file

@ -148,7 +148,7 @@ options:
- Set the state of the container - Set the state of the container
required: false required: false
default: present default: present
choices: [ "present", "stopped", "absent", "killed", "restarted" ] choices: [ "present", "running", "stopped", "absent", "killed", "restarted" ]
aliases: [] aliases: []
privileged: privileged:
description: description:
@ -632,7 +632,7 @@ def main():
env = dict(), env = dict(),
dns = dict(), dns = dict(),
detach = dict(default=True, type='bool'), detach = dict(default=True, type='bool'),
state = dict(default='present', choices=['absent', 'present', 'stopped', 'killed', 'restarted']), state = dict(default='running', choices=['absent', 'present', 'running', 'stopped', 'killed', 'restarted']),
debug = dict(default=False, type='bool'), debug = dict(default=False, type='bool'),
privileged = dict(default=False, type='bool'), privileged = dict(default=False, type='bool'),
lxc_conf = dict(default=None), lxc_conf = dict(default=None),
@ -662,25 +662,35 @@ def main():
changed = False changed = False
# start/stop containers # start/stop containers
if state == "present": if state in [ "running", "present" ]:
# make sure a container with `name` is running # 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'), running_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)
manager.start_containers(containers) if state == "present": #otherwise it get (re)started later anyways..
manager.start_containers(containers)
running_containers = manager.get_running_containers()
deployed_containers = manager.get_deployed_containers()
# start more containers if we don't have enough if state == "running":
elif delta > 0: # make sure a container with `name` is running
containers = manager.create_containers(delta) if name and "/" + name not in map(lambda x: x.get('Name'), running_containers):
manager.start_containers(containers) manager.start_containers(deployed_containers)
# stop containers if we have too many # start more containers if we don't have enough
elif delta < 0: elif delta > 0:
containers_to_stop = running_containers[0:abs(delta)] containers = manager.create_containers(delta)
containers = manager.stop_containers(containers_to_stop) manager.start_containers(containers)
manager.remove_containers(containers_to_stop)
# stop containers if we have too many
facts = manager.get_running_containers() elif delta < 0:
containers_to_stop = running_containers[0:abs(delta)]
containers = manager.stop_containers(containers_to_stop)
manager.remove_containers(containers_to_stop)
facts = manager.get_running_containers()
else:
acts = manager.get_deployed_containers()
# stop and remove containers # stop and remove containers
elif state == "absent": elif state == "absent":