Merge "When enrolling Dell nodes, use drac_address instead of deprecated drac_host"

This commit is contained in:
Jenkins 2017-06-21 16:16:37 +00:00 committed by Gerrit Code Review
commit 6a3114c0c1
3 changed files with 7 additions and 3 deletions

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Stop relying on deprecated alias ``drac_host`` for the ``drac_address``
field when enrolling Dell nodes.

View File

@ -605,7 +605,7 @@ class NodesTest(base.TestCase):
nodes.register_ironic_node(node, client=client)
client.node.create.assert_called_once_with(
driver='pxe_drac', name='node1', properties=node_properties,
driver_info={'drac_password': 'random', 'drac_host': 'foo.bar',
driver_info={'drac_password': 'random', 'drac_address': 'foo.bar',
'drac_username': 'test', 'drac_port': '6230'})
def test_register_ironic_node_redfish(self):

View File

@ -224,8 +224,7 @@ class iBootDriverInfo(PrefixedDriverInfo):
DRIVER_INFO = {
# production drivers
'(ipmi|.*_ipmitool)': PrefixedDriverInfo('ipmi', has_port=True),
'.*_drac': PrefixedDriverInfo('drac', address_field='host',
has_port=True),
'.*_drac': PrefixedDriverInfo('drac', has_port=True),
'.*_ilo': PrefixedDriverInfo('ilo'),
'.*_ucs': PrefixedDriverInfo(
'ucs',