Merge "Use new cinder target_helper option"

This commit is contained in:
Zuul 2019-03-04 12:09:39 +00:00 committed by Gerrit Code Review
commit a628deefc1
5 changed files with 13 additions and 4 deletions

View File

@ -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"

View File

@ -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 }}"

View File

@ -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 %}

View File

@ -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" }}

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.