openstack/charm-ceph-osd
Code Issues Proposed changes

Remove leading whitespace from templates/ceph.conf

Browse Source 
(ConfigParser can't parse)
This commit is contained in:
Corey Bryant 2014-09-27 17:18:59 +00:00
parent 1383cf6c5c
commit faee718892
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
templates/ceph.conf
View File

@ -1,34 +1,34 @@
[global] [global]
{% if old_auth %} {% if old_auth %}
auth supported = {{ auth_supported }} auth supported = {{ auth_supported }}
{% else %} {% else %}
auth cluster required = {{ auth_supported }} auth cluster required = {{ auth_supported }}
auth service required = {{ auth_supported }} auth service required = {{ auth_supported }}
auth client required = {{ auth_supported }} auth client required = {{ auth_supported }}
{% endif %} {% endif %}
keyring = /etc/ceph/$cluster.$name.keyring keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ mon_hosts }} mon host = {{ mon_hosts }}
fsid = {{ fsid }} fsid = {{ fsid }}
log to syslog = {{ use_syslog }} log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }} err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }} clog to syslog = {{ use_syslog }}
{%- if ceph_public_network is string %} {%- if ceph_public_network is string %}
public network = {{ ceph_public_network }} public network = {{ ceph_public_network }}
{%- endif %} {%- endif %}
{%- if ceph_cluster_network is string %} {%- if ceph_cluster_network is string %}
cluster network = {{ ceph_cluster_network }} cluster network = {{ ceph_cluster_network }}
{%- endif %} {%- endif %}
[mon] [mon]
keyring = /var/lib/ceph/mon/$cluster-$id/keyring keyring = /var/lib/ceph/mon/$cluster-$id/keyring
[mds] [mds]
keyring = /var/lib/ceph/mds/$cluster-$id/keyring keyring = /var/lib/ceph/mds/$cluster-$id/keyring
[osd] [osd]
keyring = /var/lib/ceph/osd/$cluster-$id/keyring keyring = /var/lib/ceph/osd/$cluster-$id/keyring
osd journal size = {{ osd_journal_size }} osd journal size = {{ osd_journal_size }}
filestore xattr use omap = true filestore xattr use omap = true