Change deprecated option iscsi_helper to target_helper

The iscsi_helper configuration option has been deprecated and
replaced by target_helper.  This patch updates it to use the
correct helper.

Change-Id: I3bafacb7d483dd3b1132b3c3b4411e26fc117ad8
This commit is contained in:
Mohammed Naser 2018-07-19 15:34:45 -07:00
parent 2fe8f7e09e
commit 6d75b48de0
4 changed files with 9 additions and 4 deletions

View File

@ -200,11 +200,11 @@ cinder_osapi_volume_workers_max: 16
cinder_osapi_volume_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, cinder_osapi_volume_workers_max] | min }}"
## Cinder iscsi
cinder_iscsi_helper_mapping:
cinder_target_helper_mapping:
RedHat: lioadm
Debian: tgtadm
Suse: tgtadm
cinder_iscsi_helper: "{{ cinder_iscsi_helper_mapping[ansible_os_family] }}"
cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_os_family] }}"
cinder_iscsi_iotype: fileio
cinder_iscsi_num_targets: 100
cinder_iscsi_port: 3260

View File

@ -0,0 +1,5 @@
---
upgrade:
- The variable `cinder_iscsi_helper` has been replaced by the new variable
which is `cinder_target_helper` due to the fact that iscsi_helper has
been deprecated in Cinder.

View File

@ -51,7 +51,7 @@
notify: Ensure tgt service restarted
when:
- "cinder_services['cinder-volume']['group'] in group_names"
- "cinder_iscsi_helper == 'tgtadm'"
- "cinder_target_helper == 'tgtadm'"
- cinder_backend_lvm_inuse | bool
- name: Create nfs shares export file

View File

@ -75,7 +75,7 @@ volume_name_template = {{ cinder_volume_name_template }}
storage_availability_zone = {{ cinder_storage_availability_zone }}
default_availability_zone = {{ cinder_default_availability_zone }}
iscsi_helper = {{ cinder_iscsi_helper }}
target_helper = {{ cinder_target_helper }}
iscsi_iotype = {{ cinder_iscsi_iotype }}
iscsi_ip_address = {{ cinder_storage_address }}
iscsi_num_targets = {{ cinder_iscsi_num_targets }}