openstack/openstack-helm-infra
Code Issues Proposed changes

Docker: user json-file on Fedora and CentOS

Browse Source 
The current fluent-bit implementation only supports the json-file
log driver for docker, this PS moves CentOS and Fedora to use that
until we can support Journald.

Change-Id: I8aa876aa96119d9a1a0e06c28873e3c4c1e3ace5
This commit is contained in:
portdirect 2017-12-16 16:24:28 -05:00 committed by Pete Birley
parent e4de36d97b
commit f472531ace
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2
View File

@ -17,7 +17,7 @@ ExecStart=/usr/bin/dockerd-latest \
--userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
-g /var/lib/docker \
--storage-driver=overlay \
--log-driver=journald
--log-driver=json-file
ExecReload=/bin/kill -s HUP $MAINPID
LimitNOFILE=1048576
LimitNPROC=1048576

2
tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2
View File

@ -16,7 +16,7 @@ ExecStart=/usr/bin/dockerd-latest \
--userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
-g /var/lib/docker \
--storage-driver=overlay2 \
--log-driver=journald
--log-driver=json-file
ExecReload=/bin/kill -s HUP $MAINPID
TasksMax=8192
LimitNOFILE=1048576