diff options
Diffstat (limited to 'ironic')
-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 |
3 files changed, 2 insertions, 4 deletions
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': |