Browse Source

include kubernetes config

pull/13/head
Smaine Kahlouch 10 years ago
parent
commit
5319f23e73
3 changed files with 3 additions and 1 deletions
  1. 1
      roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
  2. 1
      roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
  3. 2
      roles/kubernetes/node/templates/systemd-init/kubelet.service.j2

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

@ -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

@ -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

@ -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 \

Loading…
Cancel
Save