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 1ccdf47117b2988a38727d49ab16dbef4ceb2edd..2956cb32452786871e01857b5ce1b7adb49d66b2 100644 (file)
--- 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>