From: git-harry <git-harry@live.co.uk>
Date: Thu, 11 Dec 2014 20:49:44 +0000 (+0000)
Subject: Brick: fix bug in tgt conf for volume
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a835e70cbf33936c8bf6cbcfdcca4973363d1784;p=openstack-build%2Fcinder-build.git

Brick: fix bug in tgt conf for volume

872b7ca0fc5ce4911fdaadee464d46be5a38058d was intended to explicitly
specify the driver being used by tgt for each target. The issue is that
'lld' is not a valid directive therefore the default is being used. The
default used by tgt is iscsi.

This commit replaces 'lld' with the correct directive of 'driver'.

Change-Id: I6153ee8b24039aedc4ab471f7d00517411791dac
Closes-bug: #1396265
---

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index 1ccdf4711..2956cb324 100644
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@ -96,14 +96,14 @@ class TgtAdm(TargetAdmin):
     VOLUME_CONF = """
                 <target %s>
                     backing-store %s
-                    lld iscsi
+                    driver iscsi
                     write-cache %s
                 </target>
                   """
     VOLUME_CONF_WITH_CHAP_AUTH = """
                                 <target %s>
                                     backing-store %s
-                                    lld iscsi
+                                    driver iscsi
                                     %s
                                     write-cache %s
                                 </target>