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

Merge pull request #445 from kubespray/caliconodechoice

Browse source 
Enable customization of calico-node docker image
This commit is contained in:
Smaine Kahlouch 2016-08-28 09:36:06 +02:00 committed by GitHub
commit 108f902ed0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/calico/defaults/main.yml
View file

@ -7,9 +7,13 @@ ipip: false
# cloud_provider can only be set to 'gce' or 'aws' # cloud_provider can only be set to 'gce' or 'aws'
# cloud_provider: # cloud_provider:
calicoctl_image_repo: calico/ctl calicoctl_image_repo: calico/ctl
calicoctl_image_tag: "{{ calico_version }}" calicoctl_image_tag: "{{ calico_version }}"
calico_node_image_repo: calico/node
calico_node_image_tag: "{{ calico_version }}"
# Set to true if your Hyperkube has all required components to run # Set to true if your Hyperkube has all required components to run
# calico. This is required in order to run canalized calico. # calico. This is required in order to run canalized calico.
use_hyperkube_cni: false use_hyperkube_cni: false

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

@ -8,9 +8,9 @@ Wants=docker.socket etcd-proxy.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['kube-node'] and peer_with_router|default(false)%}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=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 }}
{% else %} {% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
{% endif %} {% endif %}
Restart=always Restart=always
RestartSec=10s RestartSec=10s