Rename deprecated 'iscsi_helper' to 'target_helper' for queens and rocky.
Change-Id: I7c5fff8d52b37ae159220c93da0cc9fc15814a80
Related-Prod: PROD-30622
diff --git a/cinder/files/backend/_lvm.conf b/cinder/files/backend/_lvm.conf
index db24344..a0187e3 100644
--- a/cinder/files/backend/_lvm.conf
+++ b/cinder/files/backend/_lvm.conf
@@ -1,4 +1,10 @@
+{%- if controller is defined %}
+ {%- set _version = controller.get('version', false) %}
+{%- elif volume is defined %}
+ {%- set _version = volume.get('version', false) %}
+{%- endif %}
+
[{{ backend_name }}]
host={{ backend.get('host', grains.host) }}
volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
@@ -6,5 +12,9 @@
{%- if backend.lvm_type is defined %}
lvm_type = {{ backend.lvm_type }}
{%- endif %}
+{%- if _version in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata", "pike"] %}
iscsi_helper = {{ backend.get('iscsi_helper', 'tgtadm') }}
+{%- else %}
+target_helper = {{ backend.get('target_helper', backend.get('iscsi_helper', 'tgtadm')) }}
+{%- endif %}
volume_group = {{ backend.volume_group }}