openstack/kolla-ansible
Code Issues Proposed changes

Use new cinder target_helper option

Browse Source 
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
This commit is contained in:
Mark Goddard 2019-01-21 10:18:26 +00:00
parent 280761394c
commit 1c22da32ff
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -730,7 +730,10 @@ gnocchi_metric_datadir_volume: "gnocchi"
cinder_backend_ceph: "{{ enable_ceph }}" cinder_backend_ceph: "{{ enable_ceph }}"
cinder_backend_vmwarevc_vmdk: "no" cinder_backend_vmwarevc_vmdk: "no"
cinder_volume_group: "cinder-volumes" 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_iscsi_helper: "tgtadm"
cinder_target_helper: "{{ cinder_iscsi_helper }}"
# Valid options are [ nfs, swift, ceph ] # Valid options are [ nfs, swift, ceph ]
cinder_backup_driver: "ceph" cinder_backup_driver: "ceph"

2
ansible/roles/cinder/defaults/main.yml
View File

@ -50,7 +50,7 @@ cinder_services:
- "/run/:/run/:shared" - "/run/:/run/:shared"
- "cinder:/var/lib/cinder" - "cinder:/var/lib/cinder"
- "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}" - "{% 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_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 '' }}" - "{{ 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 }}" dimensions: "{{ cinder_volume_dimensions }}"

4
ansible/roles/cinder/templates/cinder.conf.j2
View File

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

2
ansible/roles/iscsi/defaults/main.yml
View File

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

6
releasenotes/notes/deprecate-cinder-iscsi-helper-f736c9139e937381.yaml Normal file
View File

@ -0,0 +1,6 @@
---
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.