openstack/kolla-ansible
Code Issues Proposed changes

Merge "[glance][cinder] Stop owning RBD defaults"

Browse Source
This commit is contained in:
Zuul 2022-10-04 15:53:27 +00:00 committed by Gerrit Code Review
commit 5b848d01f0
2 changed files with 0 additions and 4 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

@ -133,9 +133,6 @@ volume_driver = cinder.volume.drivers.rbd.RBDDriver
volume_backend_name = {{ cinder_backend_ceph_name }} volume_backend_name = {{ cinder_backend_ceph_name }}
rbd_pool = {{ ceph_cinder_pool_name }} rbd_pool = {{ ceph_cinder_pool_name }}
rbd_ceph_conf = /etc/ceph/ceph.conf rbd_ceph_conf = /etc/ceph/ceph.conf
rbd_flatten_volume_from_snapshot = false
rbd_max_clone_depth = 5
rbd_store_chunk_size = 4
rados_connect_timeout = 5 rados_connect_timeout = 5
rbd_user = {{ ceph_cinder_user }} rbd_user = {{ ceph_cinder_user }}
rbd_secret_uuid = {{ cinder_rbd_secret_uuid }} rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}

1
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -80,7 +80,6 @@ filesystem_store_datadir = /var/lib/glance/images/
[rbd] [rbd]
rbd_store_user = {{ ceph_glance_user }} rbd_store_user = {{ ceph_glance_user }}
rbd_store_pool = {{ ceph_glance_pool_name }} rbd_store_pool = {{ ceph_glance_pool_name }}
rbd_store_chunk_size = 8
{% endif %} {% endif %}
{% if glance_backend_swift | bool %} {% if glance_backend_swift | bool %}