From 7f3df5634a40ea007b76e6db7bcf8de8dd4df646 Mon Sep 17 00:00:00 2001 From: nemunaire Date: Fri, 27 Mar 2015 18:07:35 +0100 Subject: [PATCH] Add optional signal parameter when killing docker container --- cloud/docker/docker.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 85eb0525a69..1f30938964a 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -176,6 +176,12 @@ options: description: - Enable detached mode to leave the container running in background. default: true + signal: + description: + - With the state "killed", you can alter the signal sent to the + container. + required: false + default: KILL state: description: - Assert the container's desired state. "present" only asserts that the @@ -1272,7 +1278,7 @@ class DockerManager(object): def kill_containers(self, containers): for i in containers: - self.client.kill(i['Id']) + self.client.kill(i['Id'], self.module.params.get('signal')) self.increment_counter('killed') def restart_containers(self, containers): @@ -1436,6 +1442,7 @@ def main(): dns = dict(), detach = dict(default=True, type='bool'), 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_retry = dict(default=0, type='int'), debug = dict(default=False, type='bool'),