Merge pull request #491 from kubespray/calicopools

Allow calico to configure pool if tree exists, but no pools defined
2016-10-05 17:12:26 +02:00
parent 648aa7422d a93639650f
commit 9ca374a88d
1 changed files with 1 additions and 1 deletions
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@ -90,7 +90,7 @@
  environment:
    NO_DEFAULT_POOLS: true
  run_once: true
-  when: calico_conf.status == 404
+  when: calico_conf.status == 404 or "nodes" not in calico_conf.content

 - name: Calico | Get calico configuration from etcd
  uri: