diff options
| author | Omar Khan <omar@omarkhan.me> | 2015-09-24 12:15:59 +0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-12-18 17:56:43 -0800 |
| commit | 299bd687b4db403ebd3fe953db03d90c4b7eec4b (patch) | |
| tree | e436e9678195e3daaf0c435302e81ee43c5ad534 | |
| parent | b42ac218df7586c7577b7f68962ce342b5fbbf21 (diff) | |
| download | ansible-modules-core-299bd687b4db403ebd3fe953db03d90c4b7eec4b.tar.gz | |
Add stop_timeout option to docker module
Conflicts:
cloud/docker/docker.py
| -rw-r--r-- | cloud/docker/docker.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 9ae14a9d..f3b2062a 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -326,6 +326,12 @@ options: default: false aliases: [] version_added: "2.0" + stop_timeout: + description: + - How many seconds to wait for the container to stop before killing it. + required: false + default: 10 + version_added: "2.0" author: - "Cove Schneider (@cove)" - "Joshua Conner (@joshuaconner)" @@ -605,6 +611,7 @@ class DockerManager(object): 'cap_add': ((0, 5, 0), '1.14'), 'cap_drop': ((0, 5, 0), '1.14'), 'read_only': ((1, 0, 0), '1.17'), + 'stop_timeout': ((0, 5, 0), '1.0'), # Clientside only 'insecure_registry': ((0, 5, 0), '0.0') } @@ -1485,7 +1492,7 @@ class DockerManager(object): def stop_containers(self, containers): for i in containers: - self.client.stop(i['Id']) + self.client.stop(i['Id'], self.module.params.get('stop_timeout')) self.increment_counter('stopped') return [self.client.wait(i['Id']) for i in containers] @@ -1686,6 +1693,7 @@ def main(): cap_add = dict(default=None, type='list'), cap_drop = dict(default=None, type='list'), read_only = dict(default=None, type='bool'), + stop_timeout = dict(default=10, type='int'), ), required_together = ( ['tls_client_cert', 'tls_client_key'], |