diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-03 23:28:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-03 23:28:15 +0000 |
| commit | 2f06cc69029acfdbefdf4970c9e3c51c55a15ae2 (patch) | |
| tree | c3ffa200f2f0e25a40018688129191da11aabe27 | |
| parent | 9a8daeaa153ce04af1f879504a13d1013f753818 (diff) | |
| parent | f8135b22f633805ed84849dc3bf0e403966c790c (diff) | |
| download | ironic-2f06cc69029acfdbefdf4970c9e3c51c55a15ae2.tar.gz | |
Merge "Enable the ramdisk deploy by default"
| -rw-r--r-- | doc/source/admin/ramdisk-boot.rst | 5 | ||||
| -rw-r--r-- | ironic/conf/default.py | 2 | ||||
| -rw-r--r-- | ironic/tests/base.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_ramdisk.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/ramdisk-deploy-384a38c3c96059dd.yaml | 6 |
5 files changed, 11 insertions, 6 deletions
diff --git a/doc/source/admin/ramdisk-boot.rst b/doc/source/admin/ramdisk-boot.rst index 29708b781..5e9900f08 100644 --- a/doc/source/admin/ramdisk-boot.rst +++ b/doc/source/admin/ramdisk-boot.rst @@ -11,8 +11,9 @@ It is suported by ``pxe``, ``ipxe``, ``redfish-virtual-media`` and Configuration ------------- -Ramdisk/ISO boot requires using the ``ramdisk`` deploy interface. As with most -non-default interfaces, it must be enabled and set for a node to be utilized: +Ramdisk/ISO boot requires using the ``ramdisk`` deploy interface. It is enabled +by default starting with the Zed release cycle. On an earlier release, it must +be enabled explicitly: .. code-block:: ini diff --git a/ironic/conf/default.py b/ironic/conf/default.py index 66555d146..0e3c32bd1 100644 --- a/ironic/conf/default.py +++ b/ironic/conf/default.py @@ -111,7 +111,7 @@ driver_opts = [ cfg.StrOpt('default_console_interface', help=_DEFAULT_IFACE_HELP.format('console')), cfg.ListOpt('enabled_deploy_interfaces', - default=['direct'], + default=['direct', 'ramdisk'], help=_ENABLED_IFACE_HELP.format('deploy')), cfg.StrOpt('default_deploy_interface', help=_DEFAULT_IFACE_HELP.format('deploy')), diff --git a/ironic/tests/base.py b/ironic/tests/base.py index ba43461b6..4b34ef0a4 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -159,7 +159,7 @@ class TestCase(oslo_test_base.BaseTestCase): values = ['fake'] if iface == 'deploy': - values.extend(['direct', 'anaconda']) + values.extend(['direct', 'ramdisk', 'anaconda']) elif iface == 'boot': values.append('pxe') elif iface == 'storage': diff --git a/ironic/tests/unit/drivers/modules/test_ramdisk.py b/ironic/tests/unit/drivers/modules/test_ramdisk.py index 4deedbfc2..498a889c4 100644 --- a/ironic/tests/unit/drivers/modules/test_ramdisk.py +++ b/ironic/tests/unit/drivers/modules/test_ramdisk.py @@ -47,8 +47,6 @@ class RamdiskDeployTestCase(db_base.DbTestCase): self.config(tftp_root=self.temp_dir, group='pxe') self.temp_dir = tempfile.mkdtemp() self.config(images_path=self.temp_dir, group='pxe') - self.config(enabled_deploy_interfaces=['ramdisk']) - self.config(enabled_boot_interfaces=['pxe']) for iface in drivers_base.ALL_INTERFACES: impl = 'fake' if iface == 'network': diff --git a/releasenotes/notes/ramdisk-deploy-384a38c3c96059dd.yaml b/releasenotes/notes/ramdisk-deploy-384a38c3c96059dd.yaml new file mode 100644 index 000000000..0fb33937e --- /dev/null +++ b/releasenotes/notes/ramdisk-deploy-384a38c3c96059dd.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The ``ramdisk`` deploy interface is now enabled by default. When the + default ``direct`` deploy is also enabled, the ``ramdisk`` deploy must be + explicitly requested on the node level. |