openstack
/
charm-ceph
Code Issues Proposed changes

fixup ceph.conf template (needs newline at EOF)

This commit is contained in:
Edward Hope-Morley 2014-09-29 11:55:42 +01:00
parent 0e3ab6ed2e
commit 3c0d71dcfe
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
templates/ceph.conf
View File

@ -22,6 +22,13 @@ public network = {{ ceph_public_network }}
cluster network = {{ ceph_cluster_network }}
{%- endif %}
{% if public_addr %}
public addr = {{ public_addr }}
{% endif %}
{% if cluster_addr %}
cluster addr = {{ cluster_addr }}
{%- endif %}
[mon]
keyring = /var/lib/ceph/mon/$cluster-$id/keyring
@ -33,9 +40,3 @@ keyring = /var/lib/ceph/osd/$cluster-$id/keyring
osd journal size = {{ osd_journal_size }}
filestore xattr use omap = true
{% if public_addr %}
public addr = {{ public_addr }}
{% endif %}
{% if cluster_addr %}
cluster addr = {{ cluster_addr }}
{%- endif %}