External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-17 22:37:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Review role order, use master ip even when fqdn are used in the inventory

Browse Source
This commit is contained in:
Smaine Kahlouch
2015-12-16 23:49:01 +01:00
parent 3a349b8519
commit b3841659d7
9 changed files with 46 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet.service.j2
View File

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