From af55e179c73980b40f6fa4a33adbb778ea74e853 Mon Sep 17 00:00:00 2001
From: Justin Hunthrop <Justin.Hunthrop@emc.com>
Date: Thu, 25 May 2017 14:29:18 -0500
Subject: [PATCH] adding --skip-exists flag for peer_with_router
---
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 eda9c2934..fa734464e 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -219,7 +219,7 @@
"apiVersion": "v1",
"metadata": {"node": "{{ inventory_hostname }}", "scope": "node", "peerIP": "{{ item.router_id }}"}
}'
- | {{ bin_dir }}/calicoctl create -f -
+ | {{ bin_dir }}/calicoctl create --skip-exists -f -
with_items: "{{ peers|default([]) }}"
when: (not legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['k8s-cluster'])
--
GitLab