From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 17 Apr 2014 11:49:05 +0000 (+0200)
Subject: Specify lld in tgt config backends
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=872b7ca0fc5ce4911fdaadee464d46be5a38058d;p=openstack-build%2Fcinder-build.git

Specify lld in tgt config backends

Otherwise when running tgt-admin --delete, it might forget
to invoke tgtadmn with "--lld iscsi" in order to delete the low-level
iscsi exports, which can cause crashes or hangs later on.

Closes-Bug: #1311640
Change-Id: I436c67c30565089236e987d84ac2609eedd2d2c7
---

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index b28c83f22..a8f590313 100644
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@ -82,11 +82,13 @@ class TgtAdm(TargetAdmin):
     VOLUME_CONF = """
                 <target %s>
                     backing-store %s
+                    lld iscsi
                 </target>
                   """
     VOLUME_CONF_WITH_CHAP_AUTH = """
                                 <target %s>
                                     backing-store %s
+                                    lld iscsi
                                     %s
                                 </target>
                                  """