Skip to content
Snippets Groups Projects
Commit 76c43f62 authored by Smaine Kahlouch's avatar Smaine Kahlouch Committed by GitHub
Browse files

Merge pull request #490 from kubespray/fix_hyperkube_cni_decision

Fix logic handling for use_hyperkube_cni
parents d0867c8d b69d5f6e
No related branches found
No related tags found
No related merge requests found
......@@ -36,12 +36,12 @@
- name: Calico | Install calico cni bin
command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico"
changed_when: false
when: not use_hyperkube_cni
when: use_hyperkube_cni|bool == false
- name: Calico | Install calico-ipam cni bin
command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/opt/cni/bin/calico-ipam"
changed_when: false
when: not use_hyperkube_cni
when: use_hyperkube_cni|bool == false
- name: Calico | Copy cni plugins from hyperkube
command: "/usr/bin/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment