openstack/metalsmith
Code Issues Proposed changes

Merge "metalsmith_instances module, pass hostname in reserve"

Browse Source
This commit is contained in:
Zuul 2022-06-24 00:34:46 +00:00 committed by Gerrit Code Review
commit c79aaef1b6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
metalsmith/test/test_metalsmith_instances.py
View File

@ -55,6 +55,7 @@ class TestMetalsmithInstances(unittest.TestCase):
def test_reserve(self): def test_reserve(self):
provisioner = mock.Mock() provisioner = mock.Mock()
instances = [{ instances = [{
'hostname': 'node-1',
'name': 'node', 'name': 'node',
'candidates': ['other_node'], 'candidates': ['other_node'],
'resource_class': 'boxen', 'resource_class': 'boxen',
@ -73,6 +74,7 @@ class TestMetalsmithInstances(unittest.TestCase):
result = mi.reserve(provisioner, instances, True) result = mi.reserve(provisioner, instances, True)
provisioner.reserve_node.assert_has_calls([ provisioner.reserve_node.assert_has_calls([
mock.call( mock.call(
hostname='node-1',
candidates=['other_node', 'node'], candidates=['other_node', 'node'],
capabilities={'foo': 'bar'}, capabilities={'foo': 'bar'},
conductor_group='group', conductor_group='group',
@ -80,6 +82,7 @@ class TestMetalsmithInstances(unittest.TestCase):
traits=['this', 'that'] traits=['this', 'that']
), ),
mock.call( mock.call(
hostname=None,
candidates=None, candidates=None,
capabilities=None, capabilities=None,
conductor_group=None, conductor_group=None,

1
metalsmith_ansible/ansible_plugins/modules/metalsmith_instances.py
View File

@ -268,6 +268,7 @@ def reserve(provisioner, instances, clean_up):
candidates = None candidates = None
try: try:
node = provisioner.reserve_node( node = provisioner.reserve_node(
hostname=instance.get('hostname'),
resource_class=instance.get('resource_class', 'baremetal'), resource_class=instance.get('resource_class', 'baremetal'),
capabilities=instance.get('capabilities'), capabilities=instance.get('capabilities'),
candidates=candidates, candidates=candidates,