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

Add optional signal parameter when killing docker container

Browse source
This commit is contained in:
nemunaire 2015-03-27 18:07:35 +01:00 committed by Matt Clay
parent 07ccd3c86b
commit f37510ebaa
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/docker/docker.py
View file

@ -206,6 +206,12 @@ options:
- Enable detached mode to leave the container running in background. If - Enable detached mode to leave the container running in background. If
disabled, fail unless the process exits cleanly. disabled, fail unless the process exits cleanly.
default: true default: true
signal:
description:
- With the state "killed", you can alter the signal sent to the
container.
required: false
default: KILL
state: state:
description: description:
- Assert the container's desired state. "present" only asserts that the - Assert the container's desired state. "present" only asserts that the
@ -1438,7 +1444,7 @@ class DockerManager(object):
def kill_containers(self, containers): def kill_containers(self, containers):
for i in containers: for i in containers:
self.client.kill(i['Id']) self.client.kill(i['Id'], self.module.params.get('signal'))
self.increment_counter('killed') self.increment_counter('killed')
def restart_containers(self, containers): def restart_containers(self, containers):
@ -1603,6 +1609,7 @@ def main():
dns = dict(), dns = dict(),
detach = dict(default=True, type='bool'), detach = dict(default=True, type='bool'),
state = dict(default='started', choices=['present', 'started', 'reloaded', 'restarted', 'stopped', 'killed', 'absent', 'running']), state = dict(default='started', choices=['present', 'started', 'reloaded', 'restarted', 'stopped', 'killed', 'absent', 'running']),
signal = dict(default=None),
restart_policy = dict(default=None, choices=['always', 'on-failure', 'no']), restart_policy = dict(default=None, choices=['always', 'on-failure', 'no']),
restart_policy_retry = dict(default=0, type='int'), restart_policy_retry = dict(default=0, type='int'),
extra_hosts = dict(type='dict'), extra_hosts = dict(type='dict'),