openstack
/
magnum
Code Issues Proposed changes

Merge "Use cluster name for fixed_network instead of private"

This commit is contained in:
Zuul 2020-03-27 23:14:43 +00:00 committed by Gerrit Code Review
parent 39af7a808b 2864fc57d4
commit 441a81910c
3 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_template_def.py
View File

@ -185,6 +185,8 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
net_name = neutron.get_fixed_network_name(context, fixed_network) net_name = neutron.get_fixed_network_name(context, fixed_network)
if net_name: if net_name:
extra_params['fixed_network_name'] = net_name extra_params['fixed_network_name'] = net_name
else:
extra_params['fixed_network_name'] = cluster.name
# NOTE(brtknr): Convert fixed subnet name to UUID. If fixed_subnet # NOTE(brtknr): Convert fixed subnet name to UUID. If fixed_subnet
# is not specified in cluster template use 'private' as the default # is not specified in cluster template use 'private' as the default

1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -81,7 +81,6 @@ parameters:
fixed_network_name: fixed_network_name:
type: string type: string
description: name of a private network to use to provision machines description: name of a private network to use to provision machines
default: "private"
fixed_subnet: fixed_subnet:
type: string type: string

1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -81,7 +81,6 @@ parameters:
fixed_network_name: fixed_network_name:
type: string type: string
description: name of a private network to use to provision machines description: name of a private network to use to provision machines
default: "private"
fixed_subnet: fixed_subnet:
type: string type: string