summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-06 08:48:05 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-06 08:48:05 -0300
commit81cb935e1817df4c633397680e963d635ed42e26 (patch)
treedd595fab3ae4cc8f5d47dcc2297ff34def6f571c /roles/openshift_facts
parent0514bdffca4e06144f4f81db037490d2c0fede40 (diff)
parent6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff)
downloadopenshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz
openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2
openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz
openshift-81cb935e1817df4c633397680e963d635ed42e26.zip
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
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 4e7785cd7..1bf912a1d 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']