From 6b71229d3f28dc12d77148a649bb7b9c5c3c4e3a Mon Sep 17 00:00:00 2001
From: arzarif <ara.zarifian@gmail.com>
Date: Thu, 27 Sep 2018 03:31:14 -0700
Subject: [PATCH] Resolve issues associated with Calico deployment in
policy-only mode. (#3392)
---
roles/network_plugin/calico/templates/calico-config.yml.j2 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/roles/network_plugin/calico/templates/calico-config.yml.j2 b/roles/network_plugin/calico/templates/calico-config.yml.j2
index 3be65deaa..dc942d850 100644
--- a/roles/network_plugin/calico/templates/calico-config.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-config.yml.j2
@@ -10,10 +10,11 @@ data:
etcd_key: "/calico-secrets/key.pem"
{% if calico_network_backend is defined and calico_network_backend == 'none' %}
cluster_type: "kubespray"
-{%- else %}
+ calico_backend: "none"
+{% else %}
cluster_type: "kubespray,bgp"
-{% endif %}
calico_backend: "bird"
+{% endif %}
{% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false) %}
as: "{{ local_as|default(global_as_num) }}"
{% endif -%}
--
GitLab