From a93639650f469bbfa6e7996b3944afe12a5f4da1 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 16 Sep 2016 09:59:13 +0400
Subject: [PATCH] Allow calico to configure pool if tree exists, but no pools
defined
---
roles/network_plugin/calico/tasks/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml
index 69f91949a..d2cbd9685 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -91,7 +91,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:
--
GitLab