openstack/ironic-inspector
Code Issues Proposed changes

Merge "Change the default discovery driver to fake-hardware"

Browse Source
This commit is contained in:
Zuul 2018-04-30 19:09:12 +00:00 committed by Gerrit Code Review
commit 361fb091a5
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -441,6 +441,7 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
iniset $TEMPEST_CONFIG service_available ironic_inspector True iniset $TEMPEST_CONFIG service_available ironic_inspector True
if [ -n "$IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK" ]; then if [ -n "$IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK" ]; then
iniset $TEMPEST_CONFIG baremetal_introspection auto_discovery_feature True iniset $TEMPEST_CONFIG baremetal_introspection auto_discovery_feature True
iniset $TEMPEST_CONFIG baremetal_introspection auto_discovery_default_driver fake-hardware
fi fi
fi fi
fi fi

6
doc/source/user/usage.rst
View File

@ -219,9 +219,9 @@ Ironic first.
For discovery, the configuration file option ``node_not_found_hook`` should be For discovery, the configuration file option ``node_not_found_hook`` should be
set to load the hook called ``enroll``. This hook will enroll the unidentified set to load the hook called ``enroll``. This hook will enroll the unidentified
node into Ironic using the ``fake`` driver (this driver is a configurable node into Ironic using the ``fake-hardware`` hardware type. (This is
option, set ``enroll_node_driver`` in the **ironic-inspector** configuration a configurable option; set ``enroll_node_driver``, in the **ironic-inspector**
file, to the Ironic driver you want). configuration file, to the Ironic hardware type or classic driver you want.)
The ``enroll`` hook will also set the ``ipmi_address`` property on the new The ``enroll`` hook will also set the ``ipmi_address`` property on the new
node, if its available in the introspection data we received, node, if its available in the introspection data we received,

2
ironic_inspector/conf/discovery.py
View File

@ -18,7 +18,7 @@ from ironic_inspector.common.i18n import _
_OPTS = [ _OPTS = [
cfg.StrOpt('enroll_node_driver', cfg.StrOpt('enroll_node_driver',
default='fake', default='fake-hardware',
help=_('The name of the Ironic driver used by the enroll ' help=_('The name of the Ironic driver used by the enroll '
'hook when creating a new node in Ironic.')), 'hook when creating a new node in Ironic.')),
] ]

5
ironic_inspector/test/unit/test_plugins_discovery.py
View File

@ -48,7 +48,8 @@ class TestEnrollNodeNotFoundHook(test_base.NodeTest):
discovery.enroll_node_not_found_hook(introspection_data) discovery.enroll_node_not_found_hook(introspection_data)
mock_create_node.assert_called_once_with('fake', ironic=self.ironic, mock_create_node.assert_called_once_with('fake-hardware',
ironic=self.ironic,
driver_info={}) driver_info={})
mock_check_existing.assert_called_once_with( mock_check_existing.assert_called_once_with(
introspection_data, {}, self.ironic) introspection_data, {}, self.ironic)
@ -66,7 +67,7 @@ class TestEnrollNodeNotFoundHook(test_base.NodeTest):
discovery.enroll_node_not_found_hook(introspection_data) discovery.enroll_node_not_found_hook(introspection_data)
mock_create_node.assert_called_once_with( mock_create_node.assert_called_once_with(
'fake', ironic=self.ironic, 'fake-hardware', ironic=self.ironic,
driver_info={'ipmi_address': '1.2.3.4'}) driver_info={'ipmi_address': '1.2.3.4'})
mock_check_existing.assert_called_once_with( mock_check_existing.assert_called_once_with(
expected_data, {'ipmi_address': '1.2.3.4'}, self.ironic) expected_data, {'ipmi_address': '1.2.3.4'}, self.ironic)

6
releasenotes/notes/discovery-default-driver-94f990bb0676369b.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``[discovery]enroll_node_driver`` option, specifying the hardware type
or driver to use for newly discovered nodes, was changed from ``fake``
classic driver to ``fake-hardware`` hardware type.