From 65e9ce265e221f060686a69efce51f982c1833b0 Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Fri, 17 May 2019 23:29:35 +0000 Subject: [PATCH] enable calico mesh if no peers in input Change-Id: I572aa6093ce8c2005e61b69dfb7c7d4ddcf65a88 Signed-off-by: davidplunkett --- .../software/charts/kubernetes/container-networking/calico.j2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/software/charts/kubernetes/container-networking/calico.j2 b/templates/software/charts/kubernetes/container-networking/calico.j2 index 6c80227..07c2bbe 100644 --- a/templates/software/charts/kubernetes/container-networking/calico.j2 +++ b/templates/software/charts/kubernetes/container-networking/calico.j2 @@ -1,4 +1,3 @@ ---- ############################################################################## # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # # @@ -33,7 +32,11 @@ data: values: networking: settings: +{% if ('peers' in yaml.networks.ksn and yaml.networks.ksn.peers is not none and yaml.networks.ksn.peers is iterable ) %} mesh: "off" +{% else %} + mesh: "on" +{% endif %} ippool: ipip: enabled: "false" @@ -45,6 +48,7 @@ data: {% for add_cidr in yaml.networks.ksn.additional_cidrs %} - {{add_cidr}} {% endfor %} +{% if ('peers' in yaml.networks.ksn and yaml.networks.ksn.peers is not none and yaml.networks.ksn.peers is iterable ) %} peers: {% for peer in yaml.networks.ksn.peers %} - apiVersion: v1 @@ -55,4 +59,6 @@ data: spec: asnumber: {{peer.asnumber}} {% endfor %} +{% endif %} ... + -- 2.16.6