move network-environment template into node role, required by kubelet

This commit is contained in:
Smaine Kahlouch
2015-12-29 12:10:49 +01:00
committed by ant31
parent e378f4fb14
commit c9d9ccf025
4 changed files with 11 additions and 14 deletions

View File

@@ -46,10 +46,3 @@
register: calico_token
when: kube_network_plugin == "calico"
delegate_to: "{{ groups['kube-master'][0] }}"
- name: tokens | Add KUBE_AUTH_TOKEN for calico
lineinfile:
regexp: "^KUBE_AUTH_TOKEN=.*$"
line: "KUBE_AUTH_TOKEN={{ calico_token.content|b64decode }}"
dest: "/etc/network-environment"
when: kube_network_plugin == "calico"

View File

@@ -42,6 +42,9 @@
src: manifests/kube-proxy.manifest.j2
dest: "{{ kube_manifest_dir }}/kube-proxy.manifest"
- name: Write network-environment
template: src=network-environment.j2 dest=/etc/network-environment mode=640
- name: Enable kubelet
service:
name: kubelet