C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch to ansible_hostname in calico

Browse source 
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 289de2fa68
commit d30c52d53d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network_plugin/calico/templates/calico-node.service.legacy.j2
View file

@ -7,7 +7,7 @@ Wants=docker.socket
[Service] [Service]
User=root User=root
PermissionsStartOnly=true PermissionsStartOnly=true
{% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%} {% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false)%}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }} ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
{% else %} {% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }} ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}

4
roles/network_plugin/calico/templates/calico.env.j2
View file

@ -7,9 +7,9 @@ CALICO_IP6=""
{% if calico_network_backend is defined %} {% if calico_network_backend is defined %}
CALICO_NETWORKING_BACKEND="{{calico_network_backend }}" CALICO_NETWORKING_BACKEND="{{calico_network_backend }}"
{% endif %} {% endif %}
{% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%} {% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false)%}
CALICO_AS="{{ local_as }}" CALICO_AS="{{ local_as }}"
{% endif %} {% endif %}
CALICO_NO_DEFAULT_POOLS="true" CALICO_NO_DEFAULT_POOLS="true"
CALICO_LIBNETWORK_ENABLED="true" CALICO_LIBNETWORK_ENABLED="true"
CALICO_HOSTNAME="{{ inventory_hostname }}" CALICO_HOSTNAME="{{ ansible_hostname }}"

2
roles/network_plugin/calico/templates/cni-calico.conf.j2
View file

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