From 5319f23e73c1e9abf5dca4d6a4f2977a03ac2768 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Wed, 18 Nov 2015 22:36:56 +0100
Subject: [PATCH] include kubernetes config

---
 .../master/templates/systemd-init/kube-proxy.service.j2         | 1 +
 .../node/templates/systemd-init/kube-proxy.service.j2           | 1 +
 roles/kubernetes/node/templates/systemd-init/kubelet.service.j2 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2 b/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
index cc3fdc77c..b1170c5d8 100644
--- a/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
+++ b/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
@@ -8,6 +8,7 @@ After=docker.service
 {% endif %}
 
 [Service]
+EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/network-environment
 ExecStart={{ bin_dir }}/kube-proxy \
 	    $KUBE_LOGTOSTDERR \
diff --git a/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2 b/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
index cc3fdc77c..b1170c5d8 100644
--- a/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
+++ b/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
@@ -8,6 +8,7 @@ After=docker.service
 {% endif %}
 
 [Service]
+EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/network-environment
 ExecStart={{ bin_dir }}/kube-proxy \
 	    $KUBE_LOGTOSTDERR \
diff --git a/roles/kubernetes/node/templates/systemd-init/kubelet.service.j2 b/roles/kubernetes/node/templates/systemd-init/kubelet.service.j2
index 5b309c793..338b4b23c 100644
--- a/roles/kubernetes/node/templates/systemd-init/kubelet.service.j2
+++ b/roles/kubernetes/node/templates/systemd-init/kubelet.service.j2
@@ -8,7 +8,7 @@ After=docker.service
 {% endif %}
 
 [Service]
-#WorkingDirectory=/var/lib/kubelet
+EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/network-environment
 ExecStart={{ bin_dir }}/kubelet \
 	    $KUBE_LOGTOSTDERR \