Merge "Use new cinder target_helper option"

ansible/group_vars/all.yml

@@ -744,7 +744,10 @@ gnocchi_metric_datadir_volume: "gnocchi"
 cinder_backend_ceph: "{{ enable_ceph }}"
 cinder_backend_vmwarevc_vmdk: "no"
 cinder_volume_group: "cinder-volumes"
+# DEPRECATED: Use 'cinder_target_helper' instead. This option will be removed
+# in the Train release.
 cinder_iscsi_helper: "tgtadm"
+cinder_target_helper: "{{ cinder_iscsi_helper }}"
 
 # Valid options are [ nfs, swift, ceph ]
 cinder_backup_driver: "ceph"

ansible/roles/cinder/defaults/main.yml

@@ -50,7 +50,7 @@ cinder_services:
       - "/run/:/run/:shared"
       - "cinder:/var/lib/cinder"
       - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
-      - "{% if enable_cinder_backend_lvm | bool and cinder_iscsi_helper == 'lioadm' %}target_config:/etc/target{% endif %}"
+      - "{% if enable_cinder_backend_lvm | bool and cinder_target_helper == 'lioadm' %}target_config:/etc/target{% endif %}"
       - "kolla_logs:/var/log/kolla/"
       - "{{ kolla_dev_repos_directory ~ '/cinder/cinder:/var/lib/kolla/venv/lib/python2.7/site-packages/cinder' if cinder_dev_mode | bool else '' }}"
     dimensions: "{{ cinder_volume_dimensions }}"

ansible/roles/cinder/templates/cinder.conf.j2

@@ -115,8 +115,8 @@ lock_path = /var/lib/cinder/tmp
 volume_group = {{ cinder_volume_group }}
 volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
 volume_backend_name = lvm-1
-iscsi_helper = {{ cinder_iscsi_helper }}
-iscsi_protocol = iscsi
+target_helper = {{ cinder_target_helper }}
+target_protocol = iscsi
 {% endif %}
 
 {% if enable_ceph | bool and cinder_backend_ceph | bool %}

ansible/roles/iscsi/defaults/main.yml

@@ -69,4 +69,4 @@ enable_iscsid_for_ironic: >-
 enable_tgtd: >-
   {{ enable_cinder | bool and
      enable_cinder_backend_lvm | bool and
-     cinder_iscsi_helper == "tgtadm" }}
+     cinder_target_helper == "tgtadm" }}

releasenotes/notes/deprecate-cinder-iscsi-helper-f736c9139e937381.yaml

+---
+deprecations:
+  - |
+    The ``cinder_iscsi_helper`` variable has been renamed to
+    ``cinder_target_helper``. Use of ``cinder_iscsi_helper`` is deprecated, and
+    will be removed during or after the Train release.