diff options
| author | Brian Coca <bcoca@ansible.com> | 2016-01-18 09:11:36 -0500 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2016-01-18 09:11:36 -0500 |
| commit | b96cd854dac078f2c9f3d1d29d3408bea7cd2df7 (patch) | |
| tree | 9904ac1b720d0f49c7cc571710bedd3f730b0772 | |
| parent | 618f74f35f5bd47904c59936fb38964e901cf647 (diff) | |
| parent | 028ecad9d46cbe8c6f02d24b5af2c14ca0620748 (diff) | |
| download | ansible-modules-core-b96cd854dac078f2c9f3d1d29d3408bea7cd2df7.tar.gz | |
Merge pull request #2437 from j3ffrw/devel
add awslogs option in docker module log driver
| -rw-r--r-- | cloud/docker/docker.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index fa8f751e..092fee25 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -120,6 +120,7 @@ options: "journald" Journald logging driver for Docker. Writes log messages to "journald". "gelf" Graylog Extended Log Format (GELF) logging driver for Docker. Writes log messages to a GELF endpoint likeGraylog or Logstash. "fluentd" Fluentd logging driver for Docker. Writes log messages to "fluentd" (forward input). + "awslogs" Awslogs logging driver for Docker. Writes log messages to AWS Cloudwatch Logs. If not defined explicitly, the Docker daemon's default ("json-file") will apply. Requires docker >= 1.6.0. required: false @@ -131,6 +132,7 @@ options: - journald - gelf - fluentd + - awslogs version_added: "2.0" log_opt: description: @@ -1802,7 +1804,7 @@ def main(): net = dict(default=None), pid = dict(default=None), insecure_registry = dict(default=False, type='bool'), - log_driver = dict(default=None, choices=['json-file', 'none', 'syslog', 'journald', 'gelf', 'fluentd']), + log_driver = dict(default=None, choices=['json-file', 'none', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs']), log_opt = dict(default=None, type='dict'), cpu_set = dict(default=None), cap_add = dict(default=None, type='list'), |