From 2aeb3a4957e17f6abace7c58cb795a4c0f50c9fd Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Wed, 10 May 2017 13:00:41 -0400 Subject: [PATCH] rgw: move default bucket quota conf vars to global "rgw override bucket index max shards" and "rgw bucket default quota max objects" were in the client section of the ceph.conf and not being applied, this commit moves them to global Resolves: bz#1391500 Signed-off-by: Ali Maredia --- roles/ceph-common/templates/ceph.conf.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 3ad873da3..d9b3df159 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -73,6 +73,12 @@ public network = {{ public_network }} {% if cluster_network is defined %} cluster network = {{ cluster_network }} {% endif %} +{% if rgw_override_bucket_index_max_shards is defined %} +rgw override bucket index max shards = {{ rgw_override_bucket_index_max_shards }} +{% endif %} +{% if rgw_bucket_default_quota_max_objects is defined %} +rgw bucket default quota max objects = {{ rgw_bucket_default_quota_max_objects }} +{% endif %} [client.libvirt] admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor @@ -109,12 +115,6 @@ host = {{ hostvars[host]['ansible_hostname'] }} {% if radosgw_dns_name is defined %} rgw dns name = {{ radosgw_dns_name }} {% endif %} -{% if rgw_override_bucket_index_max_shards is defined %} -rgw override bucket index max shards = {{ rgw_override_bucket_index_max_shards }} -{% endif %} -{% if rgw_bucket_default_quota_max_objects is defined %} -rgw bucket default quota max objects = {{ rgw_bucket_default_quota_max_objects }} -{% endif %} host = {{ hostvars[host]['ansible_hostname'] }} keyring = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }}/keyring rgw socket path = /tmp/radosgw-{{ hostvars[host]['ansible_hostname'] }}.sock