diff --git a/templates/ceph.conf b/templates/ceph.conf index d57943c8..a94483d1 100644 --- a/templates/ceph.conf +++ b/templates/ceph.conf @@ -1,29 +1,29 @@ [global] {% if old_auth %} - auth supported = {{ auth_supported }} +auth supported = {{ auth_supported }} {% else %} - auth cluster required = {{ auth_supported }} - auth service required = {{ auth_supported }} - auth client required = {{ auth_supported }} +auth cluster required = {{ auth_supported }} +auth service required = {{ auth_supported }} +auth client required = {{ auth_supported }} {% endif %} - mon host = {{ mon_hosts }} - log to syslog = {{ use_syslog }} - err to syslog = {{ use_syslog }} - clog to syslog = {{ use_syslog }} +mon host = {{ mon_hosts }} +log to syslog = {{ use_syslog }} +err to syslog = {{ use_syslog }} +clog to syslog = {{ use_syslog }} [client.radosgw.gateway] - host = {{ hostname }} - keyring = /etc/ceph/keyring.rados.gateway - rgw socket path = /tmp/radosgw.sock - log file = /var/log/ceph/radosgw.log - # Turn off 100-continue optimization as stock mod_fastcgi - # does not support it - rgw print continue = false +host = {{ hostname }} +keyring = /etc/ceph/keyring.rados.gateway +rgw socket path = /tmp/radosgw.sock +log file = /var/log/ceph/radosgw.log +# Turn off 100-continue optimization as stock mod_fastcgi +# does not support it +rgw print continue = false {% if auth_type == 'keystone' %} - rgw keystone url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/ - rgw keystone admin token = {{ admin_token }} - rgw keystone accepted roles = {{ user_roles }} - rgw keystone token cache size = {{ cache_size }} - rgw keystone revocation interval = {{ revocation_check_interval }} +rgw keystone url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/ +rgw keystone admin token = {{ admin_token }} +rgw keystone accepted roles = {{ user_roles }} +rgw keystone token cache size = {{ cache_size }} +rgw keystone revocation interval = {{ revocation_check_interval }} #nss db path = /var/lib/ceph/nss {% endif %}