From: John Griffith <john.griffith@solidfire.com>
Date: Wed, 1 May 2013 17:26:18 +0000 (-0600)
Subject: Remove old_name from kwargs when using IET helper.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=db991e6638533fb019fa5dcf59235d7302ae426e;p=openstack-build%2Fcinder-build.git

Remove old_name from kwargs when using IET helper.

The IET driver passes the input kwargs from export
directly to the IET driver, but one of the keys here
is specifically for migration and a bug associated with
going from nova-vol to cinder-uuid's.

This patch just checks in the IET code if we have the key set
and if so pops it out before passing through to iet.

Fixes bug: 1175207

Change-Id: I965bdfbe078d61b906aebc48961c1806a9fb0c59
---

diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py
index 8fc0ca9e5..ff57276a7 100644
--- a/cinder/volume/iscsi.py
+++ b/cinder/volume/iscsi.py
@@ -236,6 +236,10 @@ class IetAdm(TargetAdmin):
 
     def create_iscsi_target(self, name, tid, lun, path,
                             chap_auth=None, **kwargs):
+
+        # NOTE (jdg): Address bug: 1175207
+        kwargs.pop('old_name', None)
+
         self._new_target(name, tid, **kwargs)
         self._new_logicalunit(tid, lun, path, **kwargs)
         if chap_auth is not None: