From 2864fc57d4443fe02a4fa0d9b3faa40752a42137 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 24 Mar 2020 06:38:18 +0000 Subject: [PATCH] Use cluster name for fixed_network instead of private At present, when a fixed_network is not specified, it is given the name "private" by default. When multiple clusters are created, we end up in a situation where we end up with multiple networks all with the same name. This PS intends to make it easier to see where the resources belong to by using the cluster name. Story: 2007460 Task: 39139 Change-Id: I7f8028b716f9a9eced17d85ca2e46e2b1e34875f --- magnum/drivers/heat/k8s_template_def.py | 2 ++ magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 1 - magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/magnum/drivers/heat/k8s_template_def.py b/magnum/drivers/heat/k8s_template_def.py index 16a0894653..11d1454431 100644 --- a/magnum/drivers/heat/k8s_template_def.py +++ b/magnum/drivers/heat/k8s_template_def.py @@ -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 diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index efc8967fff..598dd47da3 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -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 diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index 896bbfc7b1..42d50f0190 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -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