Fix canal's calico networking config for ETCD TLS

Also fixes kube-apiserver upgrade that was erroneously
deleted in a previous commit.
This commit is contained in:
Matthew Mosesohn
2016-11-10 12:49:47 +03:00
parent 9ea9604b3f
commit fe16fecd8f
4 changed files with 16 additions and 33 deletions

View File

@@ -1,9 +1,11 @@
---
- name: Canal | Write flannel configuration
template:
src: network.json.j2
dest: /etc/flannel-network.json
backup: yes
- name: Canal | Set Flannel etcd configuration
command: |-
{{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} \
set /{{ cluster_name }}/network/config \
'{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "{{ flannel_backend_type }}" } }'
delegate_to: "{{groups['etcd'][0]}}"
run_once: true
- name: Canal | Write canal configmap
template: