Moving dev branch code to master branch

[yaml_builds.git] / site / hpgen10 / baremetal / calico-ip-rules.yaml

diff --git a/site/site30/baremetal/calico-ip-rules.yaml b/site/hpgen10/baremetal/calico-ip-rules.yaml
similarity index 93%
rename from site/site30/baremetal/calico-ip-rules.yaml
rename to site/hpgen10/baremetal/calico-ip-rules.yaml
index 1ad67ab..89c0e53 100644 (file)
--- a/site/site30/baremetal/calico-ip-rules.yaml
+++ b/site/hpgen10/baremetal/calico-ip-rules.yaml
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 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.                   #
@@ -46,12 +46,8 @@ data:
 
         [Service]
         Type=simple
-        #ExecStart=/opt/configure-ip-rules.sh -i bond1.2406 -c DH_SUB_POD_CIDR -o 10.34.0.0/15 -s 135.21.157.32/29
-        #ExecStart=/opt/configure-ip-rules.sh -i bond0.44 -c DH_SUB_POD_CIDR -o 10.99.0.0/16 -s 172.29.1.0/24
         ExecStart=/opt/configure-ip-rules.sh -g 172.29.1.1 -c 10.99.0.0/16 -s 172.29.1.136/29
 
-
-
         [Install]
         WantedBy=multi-user.target
       data_pipeline:
@@ -69,7 +65,7 @@ data:
             cat <<EOU
         Options are:
 
-          -c POD_CIDR     The pod CIDR for the Kubernetes cluster, e.g. 10.97.0.0/16
+          -c POD_CIDR     The pod CIDR for the Kubernetes cluster, e.g. 10.99.0.0/16
           -i INTERFACE    The interface for internal pod traffic, e.g. bond1.2006
           -o OVERLAP_CIDR (optional) This CIDR will be routed via the VRRP IP on
                           INTERFACE.  It is used to provide a work around when
@@ -118,7 +114,7 @@ data:
         shift $((OPTIND-1))
 
         if [ "x$POD_CIDR" == "x" ]; then
-            echo "Missing pod CIDR, e.g -c 10.97.0.0/16" >&2
+            echo "Missing pod CIDR, e.g -c 10.99.0.0/16" >&2
             usage
             exit 1
         fi