From f472531ace96556123f9e4ca594dfda2f12626df Mon Sep 17 00:00:00 2001 From: portdirect Date: Sat, 16 Dec 2017 16:24:28 -0500 Subject: [PATCH] Docker: user json-file on Fedora and CentOS 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 --- .../playbooks/deploy-docker/templates/centos-docker.service.j2 | 2 +- .../playbooks/deploy-docker/templates/fedora-docker.service.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2 b/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2 index b1b313cd5b..5298225e65 100644 --- a/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2 +++ b/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2 @@ -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 diff --git a/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2 b/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2 index 1337a95d55..4e7e763e2a 100644 --- a/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2 +++ b/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2 @@ -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