From b555f90c10df371275a709a98dbbcc28637493d5 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Fri, 1 Feb 2019 22:57:57 +0100 Subject: [PATCH] Allow overwriting labels on swarm mode creation Allow passing label values on cluster creation for swarm mode. This is available in all kubernetes drivers as well as swarm, but somehow missed on swarm mode. Story: 2004942 Task: 29343 Change-Id: Ie3ac66f45e27cc92993116c3df0b33873dc67e24 --- magnum/drivers/heat/swarm_mode_template_def.py | 4 ++-- magnum/tests/unit/drivers/test_template_definition.py | 6 +++--- releasenotes/notes/bug-2004942-052321df27529562.yaml | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/bug-2004942-052321df27529562.yaml diff --git a/magnum/drivers/heat/swarm_mode_template_def.py b/magnum/drivers/heat/swarm_mode_template_def.py index 266c2ea635..088a218565 100644 --- a/magnum/drivers/heat/swarm_mode_template_def.py +++ b/magnum/drivers/heat/swarm_mode_template_def.py @@ -135,11 +135,11 @@ class SwarmModeTemplateDefinition(template_def.BaseTemplateDefinition): CONF.cluster.nodes_affinity_policy for label in label_list: - extra_params[label] = cluster_template.labels.get(label) + extra_params[label] = cluster.labels.get(label) # set docker_volume_type # use the configuration default if None provided - docker_volume_type = cluster_template.labels.get( + docker_volume_type = cluster.labels.get( 'docker_volume_type', CONF.cinder.default_docker_volume_type) extra_params['docker_volume_type'] = docker_volume_type diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py index fb1794d7e0..3b41c23f35 100644 --- a/magnum/tests/unit/drivers/test_template_definition.py +++ b/magnum/tests/unit/drivers/test_template_definition.py @@ -1169,10 +1169,10 @@ class AtomicSwarmModeTemplateDefinitionTestCase(base.TestCase): mock_context.user_name = 'fake_user' mock_context.tenant = 'fake_tenant' - docker_volume_type = mock_cluster_template.labels.get( + docker_volume_type = mock_cluster.labels.get( 'docker_volume_type') - rexray_preempt = mock_cluster_template.labels.get('rexray_preempt') - availability_zone = mock_cluster_template.labels.get( + rexray_preempt = mock_cluster.labels.get('rexray_preempt') + availability_zone = mock_cluster.labels.get( 'availability_zone') number_of_secondary_masters = mock_cluster.master_count - 1 diff --git a/releasenotes/notes/bug-2004942-052321df27529562.yaml b/releasenotes/notes/bug-2004942-052321df27529562.yaml new file mode 100644 index 0000000000..990420e351 --- /dev/null +++ b/releasenotes/notes/bug-2004942-052321df27529562.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Allow overriding cluster template labels for swarm mode clusters - this + functionality was missed from this COE when it was introduced.