From ebf3ba4839e60bd4f07038a5df48145000416ce6 Mon Sep 17 00:00:00 2001 From: git-harry Date: Wed, 14 Jan 2015 10:49:11 +0000 Subject: [PATCH] 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 --- cinder/tests/targets/test_tgt_driver.py | 2 +- cinder/volume/targets/tgt.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/tests/targets/test_tgt_driver.py b/cinder/tests/targets/test_tgt_driver.py index 8ceff1f139f..f4ff698c297 100644 --- 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 =\ '\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'\ '' diff --git a/cinder/volume/targets/tgt.py b/cinder/volume/targets/tgt.py index a0991045a4c..a6a8c64f2db 100644 --- a/cinder/volume/targets/tgt.py +++ b/cinder/volume/targets/tgt.py @@ -41,14 +41,14 @@ class TgtAdm(iscsi.ISCSITarget): VOLUME_CONF = """ backing-store %s - lld iscsi + driver iscsi write-cache %s """ VOLUME_CONF_WITH_CHAP_AUTH = """ backing-store %s - lld iscsi + driver iscsi %s write-cache %s