Merge "Allow overwriting labels on swarm mode creation"

This commit is contained in:
Zuul 2019-02-06 16:05:42 +00:00 committed by Gerrit Code Review
commit 9cffb903d6
3 changed files with 10 additions and 5 deletions

View File

@ -135,11 +135,11 @@ class SwarmModeTemplateDefinition(template_def.BaseTemplateDefinition):
CONF.cluster.nodes_affinity_policy CONF.cluster.nodes_affinity_policy
for label in label_list: for label in label_list:
extra_params[label] = cluster_template.labels.get(label) extra_params[label] = cluster.labels.get(label)
# set docker_volume_type # set docker_volume_type
# use the configuration default if None provided # 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) 'docker_volume_type', CONF.cinder.default_docker_volume_type)
extra_params['docker_volume_type'] = docker_volume_type extra_params['docker_volume_type'] = docker_volume_type

View File

@ -1345,10 +1345,10 @@ class AtomicSwarmModeTemplateDefinitionTestCase(base.TestCase):
mock_context.user_name = 'fake_user' mock_context.user_name = 'fake_user'
mock_context.tenant = 'fake_tenant' mock_context.tenant = 'fake_tenant'
docker_volume_type = mock_cluster_template.labels.get( docker_volume_type = mock_cluster.labels.get(
'docker_volume_type') 'docker_volume_type')
rexray_preempt = mock_cluster_template.labels.get('rexray_preempt') rexray_preempt = mock_cluster.labels.get('rexray_preempt')
availability_zone = mock_cluster_template.labels.get( availability_zone = mock_cluster.labels.get(
'availability_zone') 'availability_zone')
number_of_secondary_masters = mock_cluster.master_count - 1 number_of_secondary_masters = mock_cluster.master_count - 1

View File

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