Enable --log-level=info for docker daemons for jenkins jobs and e2e tests except soak-continuous.

This commit is contained in:
Dawn Chen
2016-03-04 11:47:50 -08:00
parent 4d599ea309
commit fd10ca2f45
5 changed files with 18 additions and 1 deletions

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 = "--log-level=warn" -%}
{% 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