openstack/kolla-ansible
Code Issues Proposed changes

cinder.conf either supports lvm or ceph backend, not both

Browse Source 
Cinder can be configured to support either
lvm or ceph backend. Using both backends only enables lvm
as the ceph backend configuration is combined
with the lvm backend part via elif code.

Change-Id: I57e515cf7cdd6377d60bfbc45a889553ce87207a
Closes-Bug: #1654996
This commit is contained in:
Tino Schmeier 2017-01-09 14:20:38 +01:00
parent e1ed40bc79
commit dde279cbec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,8 +100,9 @@ volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
volume_backend_name = lvm-1 volume_backend_name = lvm-1
iscsi_helper = tgtadm iscsi_helper = tgtadm
iscsi_protocol = iscsi iscsi_protocol = iscsi
{% endif %}
{% elif enable_ceph | bool and cinder_backend_ceph | bool %} {% if enable_ceph | bool and cinder_backend_ceph | bool %}
[rbd-1] [rbd-1]
volume_driver = cinder.volume.drivers.rbd.RBDDriver volume_driver = cinder.volume.drivers.rbd.RBDDriver
rbd_pool = {{ ceph_cinder_pool_name }} rbd_pool = {{ ceph_cinder_pool_name }}