Fix bug in tgt conf for volume

'lld' is not a valid directive.

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

Change-Id: I165339a9652fe882c50a5a7e270675e343dceb30
Related-bug: #1396265

diff --git a/cinder/tests/targets/test_tgt_driver.py b/cinder/tests/targets/test_tgt_driver.py
index 8ceff1f139fabd6db1466d76d6186d74ee176276..f4ff698c2974379eeb87f76b5c235a3cc86ca3b3 100644 (file)
--- a/cinder/tests/targets/test_tgt_driver.py
+++ b/cinder/tests/targets/test_tgt_driver.py
@@ -157,7 +157,7 @@ class TestTgtAdmDriver(test.TestCase):
         persist_file =\
             '<target iqn.2010-10.org.openstack:volume-83c2e877-feed-46be-8435-77884fe55b45>\n'\
             '    backing-store /dev/stack-volumes-lvmdriver-1/volume-83c2e877-feed-46be-8435-77884fe55b45\n'\
-            '    lld iscsi\n'\
+            '    driver iscsi\n'\
             '    incominguser otzLy2UYbYfnP4zXLG5z 234Zweo38VGBBvrpK9nt\n'\
             '    write-cache on\n'\
             '</target>'

diff --git a/cinder/volume/targets/tgt.py b/cinder/volume/targets/tgt.py
index a0991045a4cd79973ce4b5c3eb196ea4396b0e1e..a6a8c64f2db782e4703e759620b5132c2ebd272d 100644 (file)
--- a/cinder/volume/targets/tgt.py
+++ b/cinder/volume/targets/tgt.py
@@ -41,14 +41,14 @@ class TgtAdm(iscsi.ISCSITarget):
     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>