openstack
/
magnum
Code Issues Proposed changes

[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
This commit is contained in:
Ricardo Rocha 2017-12-20 14:11:38 +00:00 committed by Spyros Trigazis (strigazi)
parent 2c3af23e04
commit 00535708bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

4
magnum/tests/unit/drivers/test_template_definition.py
View File

@ -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()