Browse Source

Merge "Use cluster name for fixed_network instead of private"

tags/10.0.0.0rc1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
441a81910c
3 changed files with 2 additions and 2 deletions
  1. +2
    -0
      magnum/drivers/heat/k8s_template_def.py
  2. +0
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  3. +0
    -1
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

+ 2
- 0
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)
if 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
# is not specified in cluster template use 'private' as the default


+ 0
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

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

fixed_subnet:
type: string


+ 0
- 1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml View File

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

fixed_subnet:
type: string


Loading…
Cancel
Save