diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-06-03 01:30:22 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-06-03 01:30:22 -0400 |
| commit | c298b5a489aa858882c2f9e116afeda3ffa2efd3 (patch) | |
| tree | 2feaca5cdd134a580b74d3fc8d09f979e2b1e1d3 /roles | |
| parent | 0290c2f86c2610e6655e9af351d057611c553754 (diff) | |
| parent | f94e1c63c31b736d2335ab31f3a5a36c1cca3dfd (diff) | |
| download | openshift-c298b5a489aa858882c2f9e116afeda3ffa2efd3.tar.gz openshift-c298b5a489aa858882c2f9e116afeda3ffa2efd3.tar.bz2 openshift-c298b5a489aa858882c2f9e116afeda3ffa2efd3.tar.xz openshift-c298b5a489aa858882c2f9e116afeda3ffa2efd3.zip | |
Merge pull request #1976 from abutcher/default-log-driver
Configure default docker logging options.
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 09b226671..3de0c23d3 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1714,7 +1714,9 @@ class OpenShiftFacts(object): set_node_ip=False) if 'docker' in roles: - docker = dict(disable_push_dockerhub=False, hosted_registry_insecure=True) + docker = dict(disable_push_dockerhub=False, + hosted_registry_insecure=True, + options='--log-driver=json-file --log-opt max-size=50m') version_info = get_docker_version_info() if version_info is not None: docker['api_version'] = version_info['api_version'] |