diff --git a/roles/network_plugin/calico/templates/cni-calico.conf.j2 b/roles/network_plugin/calico/templates/cni-calico.conf.j2 index 2b8d5b17c..f49682ea9 100644 --- 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",