From 628d4c61cb933878e70e585cd2dd233c0086b8bb Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Thu, 1 Jun 2017 17:12:07 +0200
Subject: [PATCH] When enrolling Dell nodes, use drac_address instead of
 deprecated drac_host

Change-Id: Id08a1a3c439959b160377fe271af79f1b95ba978
Closes-Bug: #1695015
---
 releasenotes/notes/drac-address-d835a529a7c17242.yaml | 5 +++++
 tripleo_common/tests/utils/test_nodes.py              | 2 +-
 tripleo_common/utils/nodes.py                         | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/drac-address-d835a529a7c17242.yaml

diff --git a/releasenotes/notes/drac-address-d835a529a7c17242.yaml b/releasenotes/notes/drac-address-d835a529a7c17242.yaml
new file mode 100644
index 000000000..1919b3931
--- /dev/null
+++ b/releasenotes/notes/drac-address-d835a529a7c17242.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Stop relying on deprecated alias ``drac_host`` for the ``drac_address``
+    field when enrolling Dell nodes.
diff --git a/tripleo_common/tests/utils/test_nodes.py b/tripleo_common/tests/utils/test_nodes.py
index 1f663b576..40b5a68bd 100644
--- a/tripleo_common/tests/utils/test_nodes.py
+++ b/tripleo_common/tests/utils/test_nodes.py
@@ -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):
diff --git a/tripleo_common/utils/nodes.py b/tripleo_common/utils/nodes.py
index 19e72f65c..d1cc51ccf 100644
--- a/tripleo_common/utils/nodes.py
+++ b/tripleo_common/utils/nodes.py
@@ -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',