include kubernetes config

2015-11-18 22:36:56 +01:00 · 2015-11-18 22:36:56 +01:00 · 4a9a82ca86
parent d2ac5ac54b
commit 4a9a82ca86
2 changed files with 2 additions and 0 deletions
--- 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 \
--- 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 \