From 00535708bfbc6497662bde2185b3f45e408152b2 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Wed, 20 Dec 2017 14:11:38 +0000 Subject: [PATCH] [k8s] Take container_infra_prefix from cluster if specified Fix the setting of container_infra_prefix on the template definition, we were taking the cluster template and ignoring cluster even if an explicit value was given. Change-Id: I658178c31080e4ea74d4e78fc1c76536d5aea73e Closes-Bug: #1739424 --- magnum/drivers/heat/k8s_fedora_template_def.py | 2 +- magnum/tests/unit/drivers/test_template_definition.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/magnum/drivers/heat/k8s_fedora_template_def.py b/magnum/drivers/heat/k8s_fedora_template_def.py index bdf38e8207..d9263d6336 100644 --- a/magnum/drivers/heat/k8s_fedora_template_def.py +++ b/magnum/drivers/heat/k8s_fedora_template_def.py @@ -82,7 +82,7 @@ class K8sFedoraTemplateDefinition(k8s_template_def.K8sTemplateDefinition): if kube_tag: extra_params['kube_tag'] = kube_tag - container_infra_prefix = cluster_template.labels.get( + container_infra_prefix = cluster.labels.get( 'container_infra_prefix') if container_infra_prefix: extra_params['container_infra_prefix'] = container_infra_prefix diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py index 9523899961..2f308fba77 100644 --- a/magnum/tests/unit/drivers/test_template_definition.py +++ b/magnum/tests/unit/drivers/test_template_definition.py @@ -270,7 +270,7 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): etcd_volume_size = mock_cluster.labels.get( 'etcd_volume_size') kube_tag = mock_cluster.labels.get('kube_tag') - container_infra_prefix = mock_cluster_template.labels.get( + container_infra_prefix = mock_cluster.labels.get( 'container_infra_prefix') k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition() @@ -353,7 +353,7 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): etcd_volume_size = mock_cluster.labels.get( 'etcd_volume_size') kube_tag = mock_cluster.labels.get('kube_tag') - container_infra_prefix = mock_cluster_template.labels.get( + container_infra_prefix = mock_cluster.labels.get( 'container_infra_prefix') k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()