Skip to content
Snippets Groups Projects
Commit 3fa84c33 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

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

parents d8081a59 dde279cb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/cinder/templates/cinder.conf.j2
+ 2
− 1
View file @ 3fa84c33
...@@ -100,8 +100,9 @@ volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver ...@@ -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 }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment