Merge "Use bay name as Mesos cluster name"
This commit is contained in:
commit
a786a2ae68
|
@ -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')
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue