openstack
/
magnum
Code Issues Proposed changes

Merge "Fix calico regression issue caused by default ipv4pool change"

This commit is contained in:
Zuul 2020-03-27 11:49:01 +00:00 committed by Gerrit Code Review
parent fbaba6e001 529b036e78
commit 39af7a808b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/drivers/heat/k8s_coreos_template_def.py
View File

@ -55,7 +55,7 @@ class CoreOSK8sTemplateDefinition(k8s_template_def.K8sTemplateDefinition):
cluster.labels.get('flannel_network_cidr', '10.100.0.0/16')
if cluster_template.network_driver == 'calico':
extra_params["pods_network_cidr"] = \
cluster.labels.get('calico_ipv4pool', '192.168.0.0/16')
cluster.labels.get('calico_ipv4pool', '10.100.0.0/16')
label_list = ['coredns_tag',
'kube_tag', 'container_infra_prefix',

2
magnum/drivers/heat/k8s_fedora_template_def.py
View File

@ -55,7 +55,7 @@ class K8sFedoraTemplateDefinition(k8s_template_def.K8sTemplateDefinition):
cluster.labels.get('flannel_network_cidr', '10.100.0.0/16')
if cluster_template.network_driver == 'calico':
extra_params["pods_network_cidr"] = \
cluster.labels.get('calico_ipv4pool', '192.168.0.0/16')
cluster.labels.get('calico_ipv4pool', '10.100.0.0/16')
# check cloud provider and cinder options. If cinder is selected,
# the cloud provider needs to be enabled.