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

Merge pull request #521 from anthonyhaussman/MethodBoolUseCNI

Browse source 
Change method to set use_hyperkube_cni var bool
This commit is contained in:
Smaine Kahlouch 2016-09-28 12:24:53 +02:00 committed by GitHub
commit 9146b8917d
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
roles/network_plugin/calico/tasks/main.yml
View file

@ -22,16 +22,15 @@
changed_when: false changed_when: false
notify: restart calico-node notify: restart calico-node
- name: Calico | Determine hyperkube cni to use depending of the version of kube - name: Calico | Do not use hyperkube cni if kube_version under v1.3.4
set_fact: set_fact:
use_hyperkube_cni: > use_hyperkube_cni: false
{%- if kube_version | version_compare('v1.3.4','>=') -%} when: kube_version | version_compare('v1.3.4','<')
true
{%- elif kube_version | version_compare('v1.3.4','<') -%} - name: Calico | Use hyperkube cni if kube_version above v1.3.4
false set_fact:
{%- else -%} use_hyperkube_cni: true
{{ ErrorCannotRecognizeVersion }} when: kube_version | version_compare('v1.3.4','>=')
{%- endif -%}
- name: Calico | Install calico cni bin - name: Calico | Install calico cni bin
command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico" command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico"