From 3f679933a6695f91d24d0ed02b52f9caab2d4e5d Mon Sep 17 00:00:00 2001
From: Ryan Walls <ryan.walls@3dsim.com>
Date: Fri, 22 May 2015 16:36:38 -0600
Subject: [PATCH] Add support for --log-driver option that docker released with
Docker 1.6
---
cloud/docker/docker.py | 116 +++++++++++++++++++++++++++--------------
1 file changed, 76 insertions(+), 40 deletions(-)
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index cb6d3dae075..e4c27797b71 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -92,6 +92,21 @@ options:
- 'alias. Use docker CLI-style syntax: C(redis:myredis).'
default: null
version_added: "1.5"
+ log_driver:
+ description:
+ - You can specify a different logging driver for the container than for the daemon.
+ "json-file" Default logging driver for Docker. Writes JSON messages to file.
+ docker logs command is available only for this logging driver.
+ "none" disables any logging for the container. docker logs won't be available with this driver.
+ "syslog" Syslog logging driver for Docker. Writes log messages to syslog.
+ docker logs command is not available for this logging driver.
+ Requires docker >= 1.6.0.
+ required: false
+ default: json-file
+ choices:
+ - json-file
+ - none
+ - syslog
memory_limit:
description:
- RAM allocated to the container as a number of bytes or as a human-readable
@@ -506,6 +521,7 @@ class DockerManager(object):
'restart_policy': ((0, 5, 0), '1.14'),
'extra_hosts': ((0, 7, 0), '1.3.1'),
'pid': ((1, 0, 0), '1.17'),
+ 'log_driver': ((1, 2, 0), '1.18'),
# Clientside only
'insecure_registry': ((0, 5, 0), '0.0')
}
@@ -1110,6 +1126,15 @@ class DockerManager(object):
self.reload_reasons.append('volumes_from ({0} => {1})'.format(actual_volumes_from, expected_volumes_from))
differing.append(container)
+ # LOG_DRIVER
+
+ expected_log_driver = set(self.module.params.get('log_driver') or [])
+ actual_log_driver = set(container['HostConfig']['LogConfig'] or [])
+ if actual_log_driver != expected_log_driver:
+ self.reload_reasons.append('log_driver ({0} => {1})'.format(actual_log_driver, expected_log_driver))
+ differing.append(container)
+ continue
+
return differing
def get_deployed_containers(self):
@@ -1206,44 +1231,7 @@ class DockerManager(object):
except Exception as e:
self.module.fail_json(msg="Failed to pull the specified image: %s" % resource, error=repr(e))
- def create_containers(self, count=1):
- try:
- mem_limit = _human_to_bytes(self.module.params.get('memory_limit'))
- except ValueError as e:
- self.module.fail_json(msg=str(e))
-
- params = {'image': self.module.params.get('image'),
- 'command': self.module.params.get('command'),
- 'ports': self.exposed_ports,
- 'volumes': self.volumes,
- 'mem_limit': mem_limit,
- 'environment': self.env,
- 'hostname': self.module.params.get('hostname'),
- 'domainname': self.module.params.get('domainname'),
- 'detach': self.module.params.get('detach'),
- 'name': self.module.params.get('name'),
- 'stdin_open': self.module.params.get('stdin_open'),
- 'tty': self.module.params.get('tty'),
- }
-
- def do_create(count, params):
- results = []
- for _ in range(count):
- result = self.client.create_container(**params)
- self.increment_counter('created')
- results.append(result)
-
- return results
-
- try:
- containers = do_create(count, params)
- except:
- self.pull_image()
- containers = do_create(count, params)
-
- return containers
-
- def start_containers(self, containers):
+ def create_host_config(self):
params = {
'lxc_conf': self.lxc_conf,
'binds': self.binds,
@@ -1256,7 +1244,7 @@ class DockerManager(object):
optionals = {}
for optional_param in ('dns', 'volumes_from', 'restart_policy',
- 'restart_policy_retry', 'pid', 'extra_hosts'):
+ 'restart_policy_retry', 'pid', 'extra_hosts', 'log_driver'):
optionals[optional_param] = self.module.params.get(optional_param)
if optionals['dns'] is not None:
@@ -1281,8 +1269,55 @@ class DockerManager(object):
self.ensure_capability('extra_hosts')
params['extra_hosts'] = optionals['extra_hosts']
+ if optionals['log_driver'] is not None:
+ self.ensure_capability('log_driver')
+ log_config = docker.utils.LogConfig(type=docker.utils.LogConfig.types.JSON)
+ log_config.type = optionals['log_driver']
+ params['log_config'] = log_config
+
+ return docker.utils.create_host_config(**params)
+
+ def create_containers(self, count=1):
+ try:
+ mem_limit = _human_to_bytes(self.module.params.get('memory_limit'))
+ except ValueError as e:
+ self.module.fail_json(msg=str(e))
+
+ params = {'image': self.module.params.get('image'),
+ 'command': self.module.params.get('command'),
+ 'ports': self.exposed_ports,
+ 'volumes': self.volumes,
+ 'mem_limit': mem_limit,
+ 'environment': self.env,
+ 'hostname': self.module.params.get('hostname'),
+ 'domainname': self.module.params.get('domainname'),
+ 'detach': self.module.params.get('detach'),
+ 'name': self.module.params.get('name'),
+ 'stdin_open': self.module.params.get('stdin_open'),
+ 'tty': self.module.params.get('tty'),
+ 'host_config': self.create_host_config(),
+ }
+
+ def do_create(count, params):
+ results = []
+ for _ in range(count):
+ result = self.client.create_container(**params)
+ self.increment_counter('created')
+ results.append(result)
+
+ return results
+
+ try:
+ containers = do_create(count, params)
+ except:
+ self.pull_image()
+ containers = do_create(count, params)
+
+ return containers
+
+ def start_containers(self, containers):
for i in containers:
- self.client.start(i['Id'], **params)
+ self.client.start(i)
self.increment_counter('started')
def stop_containers(self, containers):
@@ -1475,6 +1510,7 @@ def main():
net = dict(default=None),
pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'),
+ log_driver = dict(default='json-file', choices=['json-file', 'none', 'syslog']),
),
required_together = (
['tls_client_cert', 'tls_client_key'],