External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-17 08:57:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

baremetal tweaks

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/calico/templates/calico-config.yml.j2
View File

@@ -14,6 +14,6 @@ data:
cluster_type: "kubespray,bgp"
{% endif %}
calico_backend: "bird"
{%- if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false) %}
as: "{{ local_as }}"
{% endif -%}
{% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false) %}
as: "{{ local_as|default(global_as_num) }}"
{% endif -%}

2
roles/network_plugin/calico/templates/cni-calico.conflist.j2
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 }}",