kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change method to set use_hyperkube_cni var bool 

The precedent method returb a string "True\n" or "False\n", it seems to be an Ansible bug.
New method return a boolean
pull/521/head
Anthony Haussmann 2016-09-27 16:41:09 +02:00
parent 6b27508c93
commit 550bda951e
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"