diff --git a/HTTP-API.rst b/HTTP-API.rst index 0e88e625a..794ad1ad6 100644 --- a/HTTP-API.rst +++ b/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: diff --git a/README.rst b/README.rst index 40c75c513..61c4fde14 100644 --- a/README.rst +++ b/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. diff --git a/ironic_discoverd/conf.py b/ironic_discoverd/conf.py index ed742b492..dd1bc0d63 100644 --- a/ironic_discoverd/conf.py +++ b/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. ' diff --git a/ironic_discoverd/test/test_process.py b/ironic_discoverd/test/test_process.py index c19381a40..55e3e0a1f 100644 --- a/ironic_discoverd/test/test_process.py +++ b/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]