summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjefferson fermo <jefferson@techasiaportal.com>2015-11-10 17:24:23 +0800
committerjefffermo <jefffermo@gmail.com>2016-01-16 23:22:20 +0800
commit028ecad9d46cbe8c6f02d24b5af2c14ca0620748 (patch)
tree12352077a0dd73511ae44461b827046ef309f1c7
parent7a0b4882449f1c9730425f0055f9a1e664e7d13b (diff)
downloadansible-modules-core-028ecad9d46cbe8c6f02d24b5af2c14ca0620748.tar.gz
add awslog option in docker log driver. this option is available starting with ansible 2.1
-rw-r--r--cloud/docker/docker.py4
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'),