kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1634 from bradbeam/calico_cni 

fix for calico cni plugin node name
pull/1487/merge
Brad Beam 2017-09-11 22:18:06 -05:00 committed by GitHub
parent a51104e844 eeffbbb43c
commit 69fac8ea58
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/calico/templates/cni-calico.conf.j2
View File

@ -1,6 +1,10 @@
{ {
"name": "calico-k8s-network", "name": "calico-k8s-network",
"hostname": "{{ ansible_hostname }}", {% if cloud_provider is defined %}
"nodename": "{{ inventory_hostname }}",
{% else %}
"nodename": "{{ ansible_hostname }}",
{% endif %}
"type": "calico", "type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}", "etcd_endpoints": "{{ etcd_access_endpoint }}",
"etcd_cert_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem", "etcd_cert_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem",