From: David Plunkett <dp7642@att.com>
Date: Fri, 17 May 2019 23:34:30 +0000 (+0000)
Subject: Merge "Adding .gitreview to allow config of git-review"
X-Git-Tag: 1.0.0~22
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=9abd587e51b29c9fce90d8c8efe915858bf31784;hp=f6fc617aa74c249bf23b320708ab44ad35034505;p=yaml_builds.git

Merge "Adding .gitreview to allow config of git-review"
---

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 %}
 ...
+