Convert configdrive to use processutils.

As per the other conversions, simply move over to calling
processutils directly instead of via our wrapper.

Change-Id: I61a9b249aae54999f460038e79db0f1f36237b13
blueprint: execs-ive-had-a-few
This commit is contained in:
Michael Still 2018-05-02 20:53:22 +10:00
parent b3d2c2a94a
commit 8ac2fe4b23
2 changed files with 17 additions and 16 deletions

View File

@ -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

View File

@ -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