openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-01-11 11:55:26 +00:00 committed by Gerrit Code Review
commit 3fa84c332d
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 }}