Charm Helpers

Merge lp:~hopem/charm-helpers/lp1273067.2 into lp:charm-helpers

  1. lp1273067.2
  2. Merge into devel
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 130
Proposed branch: lp:~hopem/charm-helpers/lp1273067.2
Merge into: lp:charm-helpers
Diff against target: 21 lines (+5/-4)
1 file modified
charmhelpers/contrib/openstack/templates/ceph.conf (+5/-4)
To merge this branch: bzr merge lp:~hopem/charm-helpers/lp1273067.2
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+212234@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/templates/ceph.conf'
2--- charmhelpers/contrib/openstack/templates/ceph.conf 2014-02-13 18:16:55 +0000
3+++ charmhelpers/contrib/openstack/templates/ceph.conf 2014-03-21 19:44:07 +0000
4@@ -3,12 +3,13 @@
5 # cinder configuration file maintained by Juju
6 # local changes may be overwritten.
7 ###############################################################################
8+[global]
9 {% if auth -%}
10-[global]
11 auth_supported = {{ auth }}
12 keyring = /etc/ceph/$cluster.$name.keyring
13 mon host = {{ mon_hosts }}
14 {% endif -%}
15-log to syslog = {{ use_syslog }}
16-err to syslog = {{ use_syslog }}
17-clog to syslog = {{ use_syslog }}
18+ log to syslog = {{ use_syslog }}
19+ err to syslog = {{ use_syslog }}
20+ clog to syslog = {{ use_syslog }}
21+

Subscribers

People subscribed via source and target branches