From: Mike Perez <thingee@gmail.com>
Date: Tue, 28 Oct 2014 21:48:50 +0000 (-0700)
Subject: Fix wrong arg number for _fix_id_migration issue
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f61b3bd0beb52808383358de15df39dcaf2aa60c;p=openstack-build%2Fcinder-build.git

Fix wrong arg number for _fix_id_migration issue

If the provider_location doesn't contain the name of the volume, TGT and
ISER will fail on doing a id migration, due to wrong number of
arguments.

Change-Id: I420ceaf14edfb6a0e3b8fd1f50070dc70b6f16bd
Closes-Bug: #1386902
---

diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py
index 3835ff578..5e5e824ca 100644
--- a/cinder/volume/iscsi.py
+++ b/cinder/volume/iscsi.py
@@ -103,7 +103,7 @@ class _ExportMixin(object):
 
             msg = _('Detected inconsistency in provider_location id')
             LOG.debug('%s', msg)
-            old_name = self._fix_id_migration(context, volume)
+            old_name = self._fix_id_migration(context, volume, vg_name)
             if 'in-use' in volume['status']:
                 old_name = None
         self.create_iscsi_target(iscsi_name, iscsi_target, 0, volume_path,