Merge "debug level logs should not be translated"

diff --cc cinder/brick/local_dev/lvm.py
index b7fc057f3b71c053da384044888cc697c7678fa9,e0608f97995c045f9d72a81b148282258b950b2c..5f5aad2804b93242b064bc0c245872bef3521bef
--- 1/cinder/brick/local_dev/lvm.py
--- 2/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@@ -582,21 -601,13 +582,21 @@@ class LVM(executor.Executor)
                      {'command': err.cmd, 'response': err.stderr})
              LOG.debug(mesg)
  
-             LOG.debug(_('Attempting udev settle and retry of lvremove...'))
+             LOG.debug('Attempting udev settle and retry of lvremove...')
              run_udevadm_settle()
  
 -            self._execute('lvremove',
 -                          '-f',
 -                          '%s/%s' % (self.vg_name, name),
 -                          root_helper=self._root_helper, run_as_root=True)
 +            # The previous failing lvremove -f might leave behind
 +            # suspended devices; when lvmetad is not available, any
 +            # further lvm command will block forever.
 +            # Therefore we need to skip suspended devices on retry.
 +            LVM_CONFIG += 'devices { ignore_suspended_devices = 1}'
 +
 +            self._execute(
 +                'lvremove',
 +                '--config', LVM_CONFIG,
 +                '-f',
 +                '%s/%s' % (self.vg_name, name),
 +                root_helper=self._root_helper, run_as_root=True)
  
      def revert(self, snapshot_name):
          """Revert an LV from snapshot.

diff --cc cinder/volume/api.py
Simple merge

diff --cc cinder/volume/drivers/nfs.py
Simple merge

diff --cc cinder/volume/drivers/vmware/volumeops.py
Simple merge