Switch to ansible_hostname in calico

For consistancy with kubernetes services we should use the same
hostname for nodes, which is 'ansible_hostname'.

Also fixing missed 'kube-node' in templates, Calico is installed
on 'k8s-cluster' roles, not only 'kube-node'.
This commit is contained in:
Aleksandr Didenko
2017-01-25 11:47:42 +01:00
parent 1df50adc1c
commit 46c177b982
3 changed files with 4 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "calico-k8s-network",
{% if not legacy_calicoctl %}
"hostname": "{{ inventory_hostname }}",
"hostname": "{{ ansible_hostname }}",
{% endif %}
"type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}",