openstack
/
magnum
Code Issues Proposed changes

Use bay name as Mesos cluster name 

Add bay's name as cluster name
Unit test error

Change-Id: I52a07657ff09a5df675538904b3c985bc314d777
Closes-Bug: #1523180
This commit is contained in:
space 2016-01-13 17:13:35 +08:00
parent c85199072f
commit f0d3a93e30
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/conductor/template_definition.py
View File

@ -632,6 +632,8 @@ class UbuntuMesosTemplateDefinition(BaseTemplateDefinition):
baymodel_attr='master_flavor_id')
self.add_parameter('slave_flavor',
baymodel_attr='flavor_id')
self.add_parameter('cluster_name',
bay_attr='name')
self.add_output('api_address',
bay_attr='api_address')

4
magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
View File

@ -76,7 +76,8 @@ class TestBayConductorWithMesos(base.TestCase):
'fixed_network_cidr': '10.2.0.0/22',
'http_proxy': 'http_proxy',
'https_proxy': 'https_proxy',
'no_proxy': 'no_proxy'
'no_proxy': 'no_proxy',
'cluster_name': 'bay1'
}
self.assertEqual(expected, definition)
@ -103,6 +104,7 @@ class TestBayConductorWithMesos(base.TestCase):
'external_network': 'external_network_id',
'number_of_slaves': 1,
'number_of_masters': 1,
'cluster_name': 'bay1'
}
self.assertEqual(expected, definition)