Merge "fix missing unit in log message"

This commit is contained in:
Jenkins
2013-09-11 14:24:04 +00:00
committed by Gerrit Code Review
5 changed files with 6 additions and 5 deletions

View File

@@ -26,6 +26,7 @@
<dprince@redhat.com> <dan.prince@rackspace.com>
<edouard1.thuleau@orange.com> <thuleau@gmail.com>
<ewan.mellor@citrix.com> <emellor@silver>
<gareth@unitedstack.com> <academicgareth@gmail.com>
<ghe@debian.org> <ghe.rivero@gmail.com>
<itoumsn@nttdata.co.jp> <itoumsn@shayol>
<jake@ansolabs.com> <jake@markupisart.com>

View File

@@ -314,7 +314,7 @@ class CoraidAppliance(object):
return esm_result
def resize_volume(self, volume_name, new_volume_size_in_gb):
LOG.debug(_('Resize volume "%(name)s" to %(size)s') %
LOG.debug(_('Resize volume "%(name)s" to %(size)s GB.') %
{'name': volume_name,
'size': new_volume_size_in_gb})
repository = self.get_volume_repository(volume_name)
@@ -332,7 +332,7 @@ class CoraidAppliance(object):
'args': 'resize'}
esm_result = self.esm_command(request)
LOG.debug(_('Volume "%(name)s" resized. New size is %(size)s') %
LOG.debug(_('Volume "%(name)s" resized. New size is %(size)s GB.') %
{'name': volume_name,
'size': new_volume_size_in_gb})
return esm_result

View File

@@ -811,5 +811,5 @@ class RBDDriver(driver.VolumeDriver):
LOG.error(msg)
raise exception.VolumeBackendAPIException(data=msg)
LOG.debug(_("Extend volume from %(old_size)s to %(new_size)s"),
LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
{'old_size': old_size, 'new_size': new_size})

View File

@@ -197,7 +197,7 @@ class SheepdogDriver(driver.VolumeDriver):
LOG.error(msg)
raise exception.VolumeBackendAPIException(data=msg)
LOG.debug(_("Extend volume from %(old_size)s to %(new_size)s"),
LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
{'old_size': old_size, 'new_size': new_size})
def backup_volume(self, context, backup, backup_service):

View File

@@ -221,7 +221,7 @@ class WindowsDriver(driver.ISCSIDriver):
def extend_volume(self, volume, new_size):
"""Extend an Existing Volume."""
old_size = volume['size']
LOG.debug(_("Extended volume from %(old_size)s to %(new_size)s"),
LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
{'old_size': old_size, 'new_size': new_size})
additional_size = (new_size - old_size) * 1024
self.utils.extend(volume['name'], additional_size)