← Back to branch summary

~openstack-charmers-next/charms/wily/ceph-osd/trunk

« back to all changes in this revision

Viewing changes to templates/ceph.conf

  • Committer: Gerrit Code Review
  • Author(s): Jenkins
  • Date: 2016-03-24 17:39:12 UTC
  • mfrom: (74.1.1 trunk)
  • Revision ID: review@openstack.org-20160324173912-zk35qe8ud8aages8
Merge "Rolling upgrades of ceph osd cluster"

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/ceph.conf
33
33
osd crush location = {{crush_location}}
34
34
{% endif %}
35
35
 
 
36
[client.osd-upgrade]
 
37
keyring = /var/lib/ceph/osd/ceph.client.osd-upgrade.keyring
36
38
 
37
39
[mon]
38
40
keyring = /var/lib/ceph/mon/$cluster-$id/keyring