diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-02 17:14:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 17:14:52 -0500 |
| commit | 3cb6ca6fcddbc0117b943f70576481a65b23358a (patch) | |
| tree | f48a5bd92eff562ae82bd8f1c25ff35e9b691b49 /roles | |
| parent | 4dfe8c715bfc49a913d7c7bea80c475a9b50b41e (diff) | |
| parent | 222e0e52f7176ae028caaf8406bb0b08ebff715d (diff) | |
| download | openshift-3cb6ca6fcddbc0117b943f70576481a65b23358a.tar.gz openshift-3cb6ca6fcddbc0117b943f70576481a65b23358a.tar.bz2 openshift-3cb6ca6fcddbc0117b943f70576481a65b23358a.tar.xz openshift-3cb6ca6fcddbc0117b943f70576481a65b23358a.zip | |
Merge pull request #2681 from abutcher/journald-log-driver
Bug 1388191 - Default docker log driver should be journald
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 7c61da950..e72ab26fc 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -2027,7 +2027,7 @@ class OpenShiftFacts(object): if 'docker' in roles: docker = dict(disable_push_dockerhub=False, - options='--log-driver=json-file --log-opt max-size=50m') + options='--log-driver=journald') # NOTE: This is a workaround for a dnf output racecondition that can occur in # some situations. See https://bugzilla.redhat.com/show_bug.cgi?id=918184 if self.system_facts['ansible_pkg_mgr'] == 'dnf': |