github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22453 from dchen1107/test1

Browse Source 
Enable --log-level=info for docker daemons for scalability jenkins jo…
This commit is contained in:
Jeff Lowdermilk
2016-03-03 16:29:34 -08:00
parent afa7816c38 84689a7a69
commit 7215860ecd
5 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/saltbase/salt/docker/docker-defaults
View File

@@ -7,5 +7,9 @@
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
{% set bridge_opts = "" %}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
{% set log_level = pillar['log_level'] -%}
{% if pillar['docker_test_log_level'] is defined -%}
{% set log_level = pillar['docker_test_log_level'] -%}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}"
DOCKER_NOFILE=1000000