openstack
/
ironic-inspector
Code Issues Proposed changes

Enable ramdisk_error plugin by default 

Change-Id: I98eac405f289474c7bee6b9fe72f61240d1d7715
Partial-Bug: #1439647
This commit is contained in:
Dmitry Tantsur 2015-04-02 17:22:11 +02:00
parent 6df2042802
commit d80c7d5ee5
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HTTP-API.rst
View File

@ -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 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``. 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 * ``block_devices`` optional block devices information for
``root_device_hint`` plugin, dictionary with keys: ``root_device_hint`` plugin, dictionary with keys:

6
README.rst
View File

@ -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, These are plugins that are enabled by default and should not be disabled,
unless you understand what you're doing: unless you understand what you're doing:
``ramdisk_error``
reports error, if ``error`` field is set by the ramdisk.
``scheduler`` ``scheduler``
validates and updates basic hardware scheduling properties: CPU number and validates and updates basic hardware scheduling properties: CPU number and
architecture, memory and disk size. 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: Here are some plugins that can be additionally enabled:
``ramdisk_error``
reports error, if ``error`` field is set by the ramdisk.
``example`` ``example``
example plugin logging it's input and output. example plugin logging it's input and output.
``root_device_hint`` ``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 ``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 * Serious authentication issues were fixed, ``keystonemiddleware`` is a new
requirement. requirement.

2
ironic_discoverd/conf.py
View File

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

3
ironic_discoverd/test/test_process.py
View File

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