Browse Source

Use new cinder target_helper option

The iscsi_helper option was deprecated in favour of target_helper in
Queens, and will be removed in the Stein release.

This also renames the cinder_iscsi_helper variable to
cinder_target_helper, deprecating but still supporting the former name
until the Train release.

Change-Id: Ie38c09b2dd8598f62b0733c8444eec5f6ce3daac
tags/8.0.0.0rc1
Mark Goddard 4 months ago
parent
commit
1c22da32ff

+ 3
- 0
ansible/group_vars/all.yml View File

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

+ 1
- 1
ansible/roles/cinder/defaults/main.yml View File

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

+ 2
- 2
ansible/roles/cinder/templates/cinder.conf.j2 View File

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

+ 1
- 1
ansible/roles/iscsi/defaults/main.yml View File

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

+ 6
- 0
releasenotes/notes/deprecate-cinder-iscsi-helper-f736c9139e937381.yaml View File

@@ -0,0 +1,6 @@
1
+---
2
+deprecations:
3
+  - |
4
+    The ``cinder_iscsi_helper`` variable has been renamed to
5
+    ``cinder_target_helper``. Use of ``cinder_iscsi_helper`` is deprecated, and
6
+    will be removed during or after the Train release.

Loading…
Cancel
Save