starlingx
/
config
Code Issues Proposed changes

Add pod_network_cidr tag to the calico ERB 

As part of upgrading the calico ERB template to the calico 1.7 compliant
format, the pod_network_cidr printing tag was inadvertently left out.
This will add it back to the template so we can set the network from the
kubernetes.pp manifest.

Change-Id: Icee91f810e11fd8527beac5edb4017dd44c4611c
Story: 2002843
Task: 26751
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2018-10-28 18:42:19 -04:00
parent 766b89bb26
commit ec4048574f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/src/modules/platform/templates/calico.yaml.erb
View File

@ -260,7 +260,7 @@ spec:
# chosen from this range. Changing this value after installation will have
# no effect. This should fall within `--cluster-cidr`.
- name: CALICO_IPV4POOL_CIDR
value: "192.168.0.0/16"
value: "<%= @pod_network_cidr %>"
# Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING
value: "true"