Skip to content

Commit ec644ef

Browse files
MoteHueAlex-Welsh
authored andcommitted
Allow more configuration of Cinder Ceph backends
Allow the pool and user of each Ceph backend in Cinder to be customised. Defaults are provided to keep existing behaviour when these are not defined.
1 parent 4a5ff07 commit ec644ef

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ansible/roles/cinder/templates/cinder.conf.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ target_protocol = iscsi
163163
[{{ backend.name }}]
164164
volume_driver = cinder.volume.drivers.rbd.RBDDriver
165165
volume_backend_name = {{ backend.name }}
166-
rbd_pool = {{ ceph_cinder_pool_name }}
166+
rbd_pool = {{ backend.pool | default(ceph_cinder_pool_name) }}
167167
rbd_ceph_conf = /etc/ceph/{{ backend.cluster }}.conf
168168
rados_connect_timeout = 5
169-
rbd_user = {{ ceph_cinder_user }}
169+
rbd_user = {{ backend.user | default(ceph_cinder_user) }}
170170
rbd_cluster_name = {{ backend.cluster }}
171-
rbd_keyring_conf = /etc/ceph/{{ backend.cluster }}.{{ ceph_cinder_keyring }}
171+
rbd_keyring_conf = /etc/ceph/{{ backend.cluster }}.{{ ('client.' + backend.user + '.keyring') if backend.user is defined else ceph_cinder_keyring }}
172172
rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
173173
report_discard_supported = True
174174
{% if backend.availability_zone is defined %}

0 commit comments

Comments
 (0)