X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fkubernetes%2Fcontainer-networking%2Fcalico.j2;h=c4930ba45d95b5091a720c2b518f668f32335d20;hb=2328370b0e493672eed2dd3fabd90f84cdca5191;hp=62978a353b52757864e4a340886f2ab17b531122;hpb=6eeea10a0f4f7ff50249ed14abb28188737c7910;p=yaml_builds.git

diff --git a/site_type/sriov-a13/templates/software/charts/kubernetes/container-networking/calico.j2 b/site_type/sriov-a13/templates/software/charts/kubernetes/container-networking/calico.j2
index 62978a3..c4930ba 100644
--- a/site_type/sriov-a13/templates/software/charts/kubernetes/container-networking/calico.j2
+++ b/site_type/sriov-a13/templates/software/charts/kubernetes/container-networking/calico.j2
@@ -1,12 +1,23 @@
 ---
+##############################################################################
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.        #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License.                   #
+#                                                                            #
+# You may obtain a copy of the License at                                    #
+#       http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+##############################################################################
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: kubernetes-calico
-  replacement: true
-  #labels:
-  #  name: kubernetes-calico-global
-  #  component: kubernetes-calico
+  name: kubernetes-calico-site
   layeringDefinition:
     abstract: false
     layer: site
@@ -16,32 +27,16 @@ metadata:
       - method: merge
         path: .
   storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/CommonAddresses/v1
-        name: common-addresses
-        path: .calico.bgp.ipv4.public_service_cidr
-      dest:
-        path: .values.networking.bgp.ipv4.additional_cidrs[0]
 
 data:
   values:
     networking:
-      mtu: 1500
       settings:
 {% if ('peers' in yaml.networks.ksn and yaml.networks.ksn.peers is not none and yaml.networks.ksn.peers is iterable ) %}
         mesh: "off"
         ippool:
           ipip:
             enabled: "false"
-{% else %}
-        mesh: "on"
-        ippool:
-          ipip:
-            enabled: "true"
-            mode: "Always"
-          nat_outgoing: "true"
-          disabled: "false"
 {% endif %}
       bgp:
         asnumber: {{yaml.networks.ksn.local_asnumber}}