ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1508 from ceph/wip-rgw-conf-var-move 

rgw: move default bucket quota conf vars to global
pull/1512/head
Andrew Schoen 2017-05-10 15:23:01 -05:00 committed by GitHub
parent 18ede1694d 2aeb3a4957
commit d8c9e133d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/ceph-common/templates/ceph.conf.j2
View File

@ -73,6 +73,12 @@ public network = {{ public_network }}
{% if cluster_network is defined %} {% if cluster_network is defined %}
cluster network = {{ cluster_network }} cluster network = {{ cluster_network }}
{% endif %} {% 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] [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 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 %} {% if radosgw_dns_name is defined %}
rgw dns name = {{ radosgw_dns_name }} rgw dns name = {{ radosgw_dns_name }}
{% endif %} {% 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'] }} host = {{ hostvars[host]['ansible_hostname'] }}
keyring = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }}/keyring keyring = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }}/keyring
rgw socket path = /tmp/radosgw-{{ hostvars[host]['ansible_hostname'] }}.sock rgw socket path = /tmp/radosgw-{{ hostvars[host]['ansible_hostname'] }}.sock