cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add awslog option in docker log driver. this option is available starting with ansible 2.1

Browse source
This commit is contained in:
jefferson fermo 2015-11-10 17:24:23 +08:00 committed by Matt Clay
parent 4c6515e299
commit 9d9daeb73c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker.py
View file

@ -121,6 +121,7 @@ options:
"journald" Journald logging driver for Docker. Writes log messages to "journald". "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. "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). "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. If not defined explicitly, the Docker daemon's default ("json-file") will apply.
Requires docker >= 1.6.0. Requires docker >= 1.6.0.
required: false required: false
@ -132,6 +133,7 @@ options:
- journald - journald
- gelf - gelf
- fluentd - fluentd
- awslogs
version_added: "2.0" version_added: "2.0"
log_opt: log_opt:
description: description:
@ -1819,7 +1821,7 @@ def main():
net = dict(default=None), net = dict(default=None),
pid = dict(default=None), pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'), 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'), log_opt = dict(default=None, type='dict'),
cpu_set = dict(default=None), cpu_set = dict(default=None),
cap_add = dict(default=None, type='list'), cap_add = dict(default=None, type='list'),