C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve issues associated with Calico deployment in policy-only mode. (#3392)

Browse source
This commit is contained in:
arzarif 2018-09-27 03:31:14 -07:00 committed by k8s-ci-robot
parent 145e5c8943
commit 6b71229d3f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/network_plugin/calico/templates/calico-config.yml.j2
View file

@ -10,10 +10,11 @@ data:
etcd_key: "/calico-secrets/key.pem" etcd_key: "/calico-secrets/key.pem"
{% if calico_network_backend is defined and calico_network_backend == 'none' %} {% if calico_network_backend is defined and calico_network_backend == 'none' %}
cluster_type: "kubespray" cluster_type: "kubespray"
{%- else %} calico_backend: "none"
{% else %}
cluster_type: "kubespray,bgp" cluster_type: "kubespray,bgp"
{% endif %}
calico_backend: "bird" calico_backend: "bird"
{% endif %}
{% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false) %} {% if inventory_hostname in groups['k8s-cluster'] and peer_with_router|default(false) %}
as: "{{ local_as|default(global_as_num) }}" as: "{{ local_as|default(global_as_num) }}"
{% endif -%} {% endif -%}