baremetal tweaks

* allow installs to not have hostname overriden with fqdn from inventory
* calico-config no longer requires local as and will default to global
* when cloudprovider is not defined, use the inventory_hostname for cni-calico
* allow reset to not restart network (buggy nodes die with this cmd)
* default kube_override_hostname to inventory_hostname instead of ansible_hostname
This commit is contained in:
Ryan Zenker
2018-02-05 19:38:05 -05:00
parent 24ae85fa56
commit ad9049a49e
7 changed files with 11 additions and 8 deletions

View File

@@ -6,7 +6,7 @@
{% if cloud_provider is defined %}
"nodename": "{{ calico_kubelet_name.stdout }}",
{% else %}
"nodename": "{{ ansible_hostname }}",
"nodename": "{{ inventory_hostname }}",
{% endif %}
"type": "calico",
"etcd_endpoints": "{{ etcd_access_addresses }}",