C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

include kubernetes config

Browse source
This commit is contained in:
Smaine Kahlouch 2015-11-18 22:36:56 +01:00
parent b45261b763
commit 5319f23e73
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
View file

@ -8,6 +8,7 @@ After=docker.service
{% endif %} {% endif %}
[Service] [Service]
EnvironmentFile=/etc/kubernetes/config
EnvironmentFile=/etc/network-environment EnvironmentFile=/etc/network-environment
ExecStart={{ bin_dir }}/kube-proxy \ ExecStart={{ bin_dir }}/kube-proxy \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \

1
roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
View file

@ -8,6 +8,7 @@ After=docker.service
{% endif %} {% endif %}
[Service] [Service]
EnvironmentFile=/etc/kubernetes/config
EnvironmentFile=/etc/network-environment EnvironmentFile=/etc/network-environment
ExecStart={{ bin_dir }}/kube-proxy \ ExecStart={{ bin_dir }}/kube-proxy \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \

2
roles/kubernetes/node/templates/systemd-init/kubelet.service.j2
View file

@ -8,7 +8,7 @@ After=docker.service
{% endif %} {% endif %}
[Service] [Service]
#WorkingDirectory=/var/lib/kubelet EnvironmentFile=/etc/kubernetes/config
EnvironmentFile=/etc/network-environment EnvironmentFile=/etc/network-environment
ExecStart={{ bin_dir }}/kubelet \ ExecStart={{ bin_dir }}/kubelet \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \