External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-16 16:37:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from adidenko/calico-old-cni-fix

Browse Source 
Fix possible problems with legacy calicoctl
This commit is contained in:
Bogdan Dobrelya
2016-12-08 12:00:08 +01:00
committed by GitHub
parent fc769eb870 c9290182be
commit 710d5ae48e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/network_plugin/calico/tasks/main.yml
View File

@@ -1,4 +1,9 @@
---
- name: Calico | Check calicoctl version
run_once: true
set_fact:
legacy_calicoctl: "{{ calicoctl_image_tag | version_compare('v1.0.0', '<') }}"
- name: Calico | Write Calico cni config
template:
src: "cni-calico.conf.j2"
@@ -71,11 +76,6 @@
delegate_to: "{{groups['etcd'][0]}}"
run_once: true
- name: Calico | Check calicoctl version
run_once: true
set_fact:
legacy_calicoctl: "{{ calicoctl_image_tag | version_compare('v1.0.0', '<') }}"
- name: Calico | Configure calico network pool
shell: >
echo '{