From b69d5f6e6e25c50666c8b9ce9c187f115a04a053 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Thu, 15 Sep 2016 16:09:40 +0300 Subject: [PATCH] Fix logic handling for use_hyperkube_cni --- roles/network_plugin/calico/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml index eef15816a..1ce6c79d3 100644 --- a/roles/network_plugin/calico/tasks/main.yml +++ b/roles/network_plugin/calico/tasks/main.yml @@ -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/"