diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 90bbd2d8a0..dd8f11c66a 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -270,6 +270,7 @@ cinder_backend_pure_nvme_tcp_name: "Pure-FlashArray-nvme-tcp" cinder_ceph_backends: - name: "{{ cinder_backend_ceph_name }}" + backend_name: "{{ cinder_backend_ceph_name }}" cluster: "{{ ceph_cluster }}" user: "{{ ceph_cinder_user }}" pool: "{{ ceph_cinder_pool_name }}" diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 7320203508..649e05f357 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -156,7 +156,7 @@ target_protocol = iscsi {% for backend in cinder_ceph_backends %} [{{ backend.name }}] volume_driver = cinder.volume.drivers.rbd.RBDDriver -volume_backend_name = {{ backend.name }} +volume_backend_name = {{ backend.backend_name | default(backend.name) }} rbd_pool = {{ backend.pool }} rbd_ceph_conf = /etc/ceph/{{ backend.cluster }}.conf rados_connect_timeout = 5 diff --git a/releasenotes/notes/cinder-ceph-backend-name-0984e44da7905a81.yaml b/releasenotes/notes/cinder-ceph-backend-name-0984e44da7905a81.yaml new file mode 100644 index 0000000000..bbb39933e9 --- /dev/null +++ b/releasenotes/notes/cinder-ceph-backend-name-0984e44da7905a81.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added support for explicitly setting ``volume_backend_name`` for + Cinder Ceph backends by the new variable ``backend_name`` in + the ``cinder_ceph_backends`` dictionary configuration.