Merge "Amend unused variables to assist pylint testing"

diff --cc cinder/backup/drivers/swift.py
Simple merge

diff --cc cinder/brick/iscsi/iscsi.py
Simple merge

diff --cc cinder/brick/local_dev/lvm.py
index 252fa05d0dd243ef7f6b85244685ab0943256976,205c2db03a4ba75fbfc9507750327e3d42088d60..562fd761a620bc2b607521293ad9e06b10d73161
--- 1/cinder/brick/local_dev/lvm.py
--- 2/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@@ -253,12 -249,12 +253,12 @@@ class LVM(executor.Executor)
              cmd.append(vg_name)
  
          lvs_start = time.time()
-         (out, err) = putils.execute(*cmd,
-                                     root_helper=root_helper,
-                                     run_as_root=True)
+         (out, _err) = putils.execute(*cmd,
+                                      root_helper=root_helper,
+                                      run_as_root=True)
          total_time = time.time() - lvs_start
          if total_time > 60:
 -            LOG.warning(_('Took %s seconds to get logical volumes.'),
 +            LOG.warning(_LW('Took %s seconds to get logical volumes.'),
                          total_time)
  
          lv_list = []
@@@ -362,13 -344,12 +362,13 @@@
              cmd.append(vg_name)
  
          start_vgs = time.time()
-         (out, err) = putils.execute(*cmd,
-                                     root_helper=root_helper,
-                                     run_as_root=True)
+         (out, _err) = putils.execute(*cmd,
+                                      root_helper=root_helper,
+                                      run_as_root=True)
          total_time = time.time() - start_vgs
          if total_time > 60:
 -            LOG.warning(_('Took %s seconds to get volume groups.'), total_time)
 +            LOG.warning(_LW('Took %s seconds to get '
 +                            'volume groups.'), total_time)
  
          vg_list = []
          if out is not None:

diff --cc cinder/brick/remotefs/remotefs.py
Simple merge

diff --cc cinder/tests/test_backup_swift.py
Simple merge

diff --cc cinder/tests/test_glusterfs.py
Simple merge

diff --cc cinder/tests/test_gpfs.py
Simple merge

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

diff --cc cinder/volume/drivers/netapp/iscsi.py
Simple merge

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

diff --cc cinder/volume/drivers/san/hp/hp_3par_common.py
Simple merge

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