openstack
/
cinder
Code Issues Proposed changes

Merge "LVM driver: Remove "six" usage"

This commit is contained in:
Zuul 2023-03-23 15:41:11 +00:00 committed by Gerrit Code Review
parent 45fd889c78 995bdec2ed
commit dc8bc8e028
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/drivers/lvm.py
View File

@ -25,7 +25,6 @@ from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
from oslo_utils import units
import six
from cinder.brick.local_dev import lvm
from cinder import exception
@ -377,7 +376,7 @@ class LVMVolumeDriver(driver.VolumeDriver):
except processutils.ProcessExecutionError as exc:
exception_message = (_("Failed to create thin pool, "
"error message was: %s")
% six.text_type(exc.stderr))
% str(exc.stderr))
raise exception.VolumeBackendAPIException(
data=exception_message)
@ -816,7 +815,7 @@ class LVMVolumeDriver(driver.VolumeDriver):
with excutils.save_and_reraise_exception():
LOG.error("Volume migration failed due to "
"exception: %(reason)s.",
{'reason': six.text_type(e)}, resource=volume)
{'reason': str(e)}, resource=volume)
dest_vg_ref.delete(volume)
self._delete_volume(volume)
return (True, None)