Browse Source

Enable ramdisk_error plugin by default

Change-Id: I98eac405f289474c7bee6b9fe72f61240d1d7715
Partial-Bug: #1439647
changes/68/170168/1
Dmitry Tantsur 7 years ago
parent
commit
d80c7d5ee5
  1. 3
      HTTP-API.rst
  2. 6
      README.rst
  3. 2
      ironic_discoverd/conf.py
  4. 3
      ironic_discoverd/test/test_process.py

3
HTTP-API.rst

@ -73,6 +73,9 @@ the ramdisk. Request body: JSON dictionary with at least these keys:
PXE booted from either in standard format ``11:22:33:44:55:66`` or
in *PXELinux* ``BOOTIF`` format ``01-11-22-33-44-55-66``.
* ``error`` optional error happened during ramdisk run, interpreted by
``ramdisk_error`` plugin
* ``block_devices`` optional block devices information for
``root_device_hint`` plugin, dictionary with keys:

6
README.rst

@ -293,6 +293,8 @@ introspection data. Note that order does matter in this option.
These are plugins that are enabled by default and should not be disabled,
unless you understand what you're doing:
``ramdisk_error``
reports error, if ``error`` field is set by the ramdisk.
``scheduler``
validates and updates basic hardware scheduling properties: CPU number and
architecture, memory and disk size.
@ -301,8 +303,6 @@ unless you understand what you're doing:
Here are some plugins that can be additionally enabled:
``ramdisk_error``
reports error, if ``error`` field is set by the ramdisk.
``example``
example plugin logging it's input and output.
``root_device_hint``
@ -386,6 +386,8 @@ See `1.1.0 release tracking page`_ for details.
* Plugin ``root_device_hint`` for in-band root device discovery.
* Plugin ``ramdisk_error`` is now enabled by default.
* Serious authentication issues were fixed, ``keystonemiddleware`` is a new
requirement.

2
ironic_discoverd/conf.py

@ -109,7 +109,7 @@ SERVICE_OPTS = [
help='SQLite3 database to store nodes under introspection, '
'required. Do not use :memory: here, it won\'t work.'),
cfg.StrOpt('processing_hooks',
default='scheduler,validate_interfaces',
default='ramdisk_error,scheduler,validate_interfaces',
help='Comma-separated list of enabled hooks for processing '
'pipeline. Hook \'scheduler\' updates the node with the '
'minimum properties required by the Nova scheduler. '

3
ironic_discoverd/test/test_process.py

@ -33,9 +33,6 @@ CONF = cfg.CONF
class BaseTest(test_base.NodeTest):
def setUp(self):
super(BaseTest, self).setUp()
CONF.set_override('processing_hooks',
'ramdisk_error,scheduler,validate_interfaces',
'discoverd')
self.started_at = time.time()
self.all_macs = self.macs + ['DE:AD:BE:EF:DE:AD']
self.pxe_mac = self.macs[1]

Loading…
Cancel
Save