Merge pull request #1634 from bradbeam/calico_cni

fix for calico cni plugin node name
2017-09-11 22:18:06 -05:00 · 2017-09-11 22:18:06 -05:00 · 69fac8ea58
parent a51104e844 eeffbbb43c
commit 69fac8ea58
1 changed files with 5 additions and 1 deletions
--- a/roles/network_plugin/calico/templates/cni-calico.conf.j2
+++ b/roles/network_plugin/calico/templates/cni-calico.conf.j2
@ -1,6 +1,10 @@
 {
  "name": "calico-k8s-network",
-  "hostname": "{{ ansible_hostname }}",
+{% if cloud_provider is defined %}
+  "nodename": "{{ inventory_hostname }}",
+{% else %}
+  "nodename": "{{ ansible_hostname }}",
+{% endif %}
  "type": "calico",
  "etcd_endpoints": "{{ etcd_access_endpoint }}",
  "etcd_cert_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem",