aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-10-04 15:53:27 +0000
committerGerrit Code Review <review@openstack.org>2022-10-04 15:53:27 +0000
commit5b848d01f004edcd1aff511f4a09ecb2fdb9f9e1 (patch)
treef7e46dd8036a3a818fb62b9976a4157975e355a0 /ansible
parentc2cbf061b6cb10ea35c6639acc3aff583bffb299 (diff)
parent52ec5ef3903896baaaa7a691bfb5b3ee329fdb12 (diff)
downloadkolla-ansible-5b848d01f004edcd1aff511f4a09ecb2fdb9f9e1.tar.gz
kolla-ansible-5b848d01f004edcd1aff511f4a09ecb2fdb9f9e1.zip
Merge "[glance][cinder] Stop owning RBD defaults"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/cinder/templates/cinder.conf.j23
-rw-r--r--ansible/roles/glance/templates/glance-api.conf.j21
2 files changed, 0 insertions, 4 deletions
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 61019537f..1d0cd4dc8 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -133,9 +133,6 @@ volume_driver = cinder.volume.drivers.rbd.RBDDriver
volume_backend_name = {{ cinder_backend_ceph_name }}
rbd_pool = {{ ceph_cinder_pool_name }}
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
rbd_user = {{ ceph_cinder_user }}
rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 2fcbaf963..409156799 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -80,7 +80,6 @@ filesystem_store_datadir = /var/lib/glance/images/
[rbd]
rbd_store_user = {{ ceph_glance_user }}
rbd_store_pool = {{ ceph_glance_pool_name }}
-rbd_store_chunk_size = 8
{% endif %}
{% if glance_backend_swift | bool %}