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 | |
| 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
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 0a1b8c5c4..e47ad99a1 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -79,7 +79,7 @@ openshift_release=v1.4 # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True # Items added, as is, to end of /etc/sysconfig/docker OPTIONS -# Default value: "--log-driver=json-file --log-opt max-size=50m" +# Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" # Specify exact version of Docker to configure or upgrade to. diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 89b9d7e48..8d327e82a 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -79,7 +79,7 @@ openshift_release=v3.4 # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True # Items added, as is, to end of /etc/sysconfig/docker OPTIONS -# Default value: "--log-driver=json-file --log-opt max-size=50m" +# Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" # Specify exact version of Docker to configure or upgrade to. 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': |