X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fsoftware%2Fcharts%2Fkubernetes%2Fcontainer-networking%2Fcalico.j2;h=07c2bbebfb003a2ddcf5b3d64ecb581708415a4f;hb=65e9ce265e221f060686a69efce51f982c1833b0;hp=6c802273978b7f5c811988469ad872e088f21dbd;hpb=8e1d108f64f06572790ee4db71bc1d9dd32e82da;p=yaml_builds.git 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 %} ... +