diff --git a/nova/tests/unit/test_configdrive2.py b/nova/tests/unit/test_configdrive2.py index b0ff80423d9f..21905d5e692c 100644 --- a/nova/tests/unit/test_configdrive2.py +++ b/nova/tests/unit/test_configdrive2.py @@ -38,7 +38,7 @@ class FakeInstanceMD(object): class ConfigDriveTestCase(test.NoDBTestCase): - @mock.patch.object(utils, 'execute', return_value=None) + @mock.patch('oslo_concurrency.processutils.execute', return_value=None) def test_create_configdrive_iso(self, mock_execute): CONF.set_override('config_drive_format', 'iso9660') imagefile = None diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index 40a3dcae62ad..3e601ad436cc 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -18,6 +18,7 @@ import os import shutil +from oslo_concurrency import processutils from oslo_utils import fileutils from oslo_utils import units import six @@ -81,21 +82,21 @@ class ConfigDriveBuilder(object): 'version': version.version_string_with_package() } - utils.execute(CONF.mkisofs_cmd, - '-o', path, - '-ldots', - '-allow-lowercase', - '-allow-multidot', - '-l', - '-publisher', - publisher, - '-quiet', - '-J', - '-r', - '-V', 'config-2', - tmpdir, - attempts=1, - run_as_root=False) + processutils.execute(CONF.mkisofs_cmd, + '-o', path, + '-ldots', + '-allow-lowercase', + '-allow-multidot', + '-l', + '-publisher', + publisher, + '-quiet', + '-J', + '-r', + '-V', 'config-2', + tmpdir, + attempts=1, + run_as_root=False) def _make_vfat(self, path, tmpdir): # NOTE(mikal): This is a little horrible, but I couldn't find an