From 0a1b92f34829cd926def188d1965b6bf3626286f Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Sat, 12 Dec 2015 19:11:09 +0100
Subject: [PATCH] cluster log level variable 'kube_log_level'
---
roles/kubernetes/node/templates/config.j2 | 2 +-
roles/kubernetes/node/templates/kubelet.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/kubernetes/node/templates/config.j2 b/roles/kubernetes/node/templates/config.j2
index f68dffb3d..03752e1c9 100644
--- a/roles/kubernetes/node/templates/config.j2
+++ b/roles/kubernetes/node/templates/config.j2
@@ -17,7 +17,7 @@
KUBE_LOGTOSTDERR="--logtostderr=true"
# journal message level, 0 is debug
-KUBE_LOG_LEVEL="{{ kube_log_level | default('--v=2') }}"
+KUBE_LOG_LEVEL="--v={{ kube_log_level | default('2') }}"
# Should this cluster be allowed to run privileged docker containers
KUBE_ALLOW_PRIV="--allow_privileged=true"
diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2
index b062a055a..0db8483d1 100644
--- a/roles/kubernetes/node/templates/kubelet.j2
+++ b/roles/kubernetes/node/templates/kubelet.j2
@@ -1,6 +1,6 @@
[Service]
Environment="KUBE_LOGTOSTDERR=--logtostderr=true"
-Environment="KUBE_LOG_LEVEL={{ kube_log_level | default('--v=2') }}"
+Environment="KUBE_LOG_LEVEL=--v={{ kube_log_level | default('2') }}"
Environment="KUBE_ALLOW_PRIV=--allow_privileged=true"
{% if inventory_hostname in groups['kube-master'] %}
Environment="KUBELET_API_SERVER=--api_servers=http://{{ hostvars[inventory_hostname]['ip'] | default(hostvars[inventory_hostname]['ansible_default_ipv4']['address']) }}:{{ kube_apiserver_insecure_port }}"
--
GitLab