Merge pull request #492 from bogdando/fix_cni

Fix use_hyperkube_cni logic

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