openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow different configuration of iSCSI helper"

Browse Source
This commit is contained in:
Jenkins 2017-04-19 15:14:15 +00:00 committed by Gerrit Code Review
commit 1f4d70851a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}" enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}"
cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}" cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
cinder_iscsi_helper: "tgtadm"
############################################# #############################################
# Hitachi NAS Platform iSCSI and NFS drivers # Hitachi NAS Platform iSCSI and NFS drivers

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

@ -98,7 +98,7 @@ 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 = tgtadm iscsi_helper = {{ cinder_iscsi_helper }}
iscsi_protocol = iscsi iscsi_protocol = iscsi
{% endif %} {% endif %}