Use iscsi_helper instead of target_helper on logs

With the deprecation of LVMISCSIDriver and LVMISERDriver a log warning
was introduced to request using LVMVolumeDriver and setting
target_helper, but it is missleading, as it should say iscsi_helper to
be clear on what is expected on the target configuration.

Change-Id: I0585a9c7a2ac1679213a6224955aa9762386e2ff

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index e7098916eb0093f7350ac44616200d28b58f3a70..87d8756e8df31427a64fa2aac2f081af9f6b11d9 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -625,7 +625,7 @@ class LVMISCSIDriver(LVMVolumeDriver):
         super(LVMISCSIDriver, self).__init__(*args, **kwargs)
         LOG.warning(_LW('LVMISCSIDriver is deprecated, you should '
                         'now just use LVMVolumeDriver and specify '
-                        'target_helper for the target driver you '
+                        'iscsi_helper for the target driver you '
                         'wish to use.'))
 
 
@@ -642,7 +642,7 @@ class LVMISERDriver(LVMVolumeDriver):
 
         LOG.warning(_LW('LVMISERDriver is deprecated, you should '
                         'now just use LVMVolumeDriver and specify '
-                        'target_helper for the target driver you '
+                        'iscsi_helper for the target driver you '
                         'wish to use. In order to enable iser, please '
                         'set iscsi_protocol with the value iser.'))
 

diff --git a/cinder/volume/targets/iser.py b/cinder/volume/targets/iser.py
index 1fee34eff86e1d1d6363f89908f79b4bb76bcde9..9505b4bdd5a54fd59df9773a41c657e4a123889d 100644 (file)
--- a/cinder/volume/targets/iser.py
+++ b/cinder/volume/targets/iser.py
@@ -27,7 +27,7 @@ class ISERTgtAdm(TgtAdm):
 
         LOG.warning(_LW('ISERTgtAdm is deprecated, you should '
                         'now just use LVMVolumeDriver and specify '
-                        'target_helper for the target driver you '
+                        'iscsi_helper for the target driver you '
                         'wish to use. In order to enable iser, please '
                         'set iscsi_protocol=iser with lioadm or tgtadm '
                         'target helpers.'))