From 5ed3916f8239cb32ae5655b5aaffb6c55312ee8f Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 16 Sep 2016 12:45:40 +0200 Subject: [PATCH] Fix use_hyperkube_cni logic Signed-off-by: Bogdan Dobrelya --- roles/network_plugin/calico/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml index ff7bc32ae..69f91949a 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: use_hyperkube_cni|bool == false + when: "{{ not use_hyperkube_cni|bool }}" - 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: use_hyperkube_cni|bool == false + when: "{{ not use_hyperkube_cni|bool }}" - 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/" @@ -50,7 +50,7 @@ retries: 4 delay: "{{ retry_stagger | random + 3 }}" changed_when: false - when: use_hyperkube_cni + when: "{{ use_hyperkube_cni|bool }}" - name: Calico | wait for etcd uri: url=http://localhost:2379/health