Commit 878d85df authored by Brendan Burns's avatar Brendan Burns

Add a log level flag.

parent f81b6b21
......@@ -2,4 +2,5 @@ base:
'*':
- mine
- cluster-params
- logging
- privilege
......@@ -46,4 +46,4 @@
{% endif -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}}"
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"
......@@ -46,4 +46,4 @@
{% endif -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}"
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{pillar['log_level']}}"
......@@ -9,4 +9,4 @@
{% set api_servers = "-master=http://" + ips[0][0] + ":7080" -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{api_servers}}"
DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{pillar['log_level']}}"
......@@ -4,4 +4,4 @@
{% endif -%}
{% set master="-master=127.0.0.1:8080" -%}
DAEMON_ARGS="{{daemon_args}} {{master}}"
DAEMON_ARGS="{{daemon_args}} {{master}} {{pillar['log_level']}}"
......@@ -27,4 +27,4 @@
{% set registry_qps = "-registry_qps=0.1" %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}}"
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment