Fix possible problems with legacy calicoctl

When running legacy calicoctl we do not specify calico hostname in
calico-node container thus we should not specify it in CNI config.

Also move 'legacy_calicoctl' set_fact task to the top.
This commit is contained in:
Aleksandr Didenko
2016-12-07 12:13:12 +01:00
parent 36fe2cb5ea
commit c9290182be
2 changed files with 7 additions and 5 deletions

View File

@@ -1,6 +1,8 @@
{
"name": "calico-k8s-network",
{% if not legacy_calicoctl %}
"hostname": "{{ inventory_hostname }}",
{% endif %}
"type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}",
"etcd_cert_file": "{{ etcd_cert_dir }}/node.pem",