From 878d85df0c5c4d8319b3a0babce70f6caf2aa4e6 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Mon, 15 Dec 2014 11:09:32 -0800
Subject: [PATCH] Add a log level flag.

---
 cluster/saltbase/pillar/logging.sls                   | 1 +
 cluster/saltbase/pillar/top.sls                       | 1 +
 cluster/saltbase/salt/kube-apiserver/default          | 2 +-
 cluster/saltbase/salt/kube-controller-manager/default | 2 +-
 cluster/saltbase/salt/kube-proxy/default              | 2 +-
 cluster/saltbase/salt/kube-scheduler/default          | 2 +-
 cluster/saltbase/salt/kubelet/default                 | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 cluster/saltbase/pillar/logging.sls

diff --git a/cluster/saltbase/pillar/logging.sls b/cluster/saltbase/pillar/logging.sls
new file mode 100644
index 00000000000..bfe24038bcc
--- /dev/null
+++ b/cluster/saltbase/pillar/logging.sls
@@ -0,0 +1 @@
+log_level: "-v=2"
diff --git a/cluster/saltbase/pillar/top.sls b/cluster/saltbase/pillar/top.sls
index 297721a43d4..9e74dfbb880 100644
--- a/cluster/saltbase/pillar/top.sls
+++ b/cluster/saltbase/pillar/top.sls
@@ -2,4 +2,5 @@ base:
   '*':
     - mine
     - cluster-params
+    - logging
     - privilege
diff --git a/cluster/saltbase/salt/kube-apiserver/default b/cluster/saltbase/salt/kube-apiserver/default
index 5870679f86a..c8deb63f852 100644
--- a/cluster/saltbase/salt/kube-apiserver/default
+++ b/cluster/saltbase/salt/kube-apiserver/default
@@ -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']}}"
diff --git a/cluster/saltbase/salt/kube-controller-manager/default b/cluster/saltbase/salt/kube-controller-manager/default
index ab47e3ddc68..88f8b033073 100644
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
@@ -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']}}"
diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default
index 0e07435040d..5fee39edffc 100644
--- a/cluster/saltbase/salt/kube-proxy/default
+++ b/cluster/saltbase/salt/kube-proxy/default
@@ -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']}}"
diff --git a/cluster/saltbase/salt/kube-scheduler/default b/cluster/saltbase/salt/kube-scheduler/default
index fc928d81deb..273b0908f89 100644
--- a/cluster/saltbase/salt/kube-scheduler/default
+++ b/cluster/saltbase/salt/kube-scheduler/default
@@ -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']}}"
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 8d59dcf3c5c..7492562977b 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -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']}}"