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
=== modified file 'charmhelpers/contrib/openstack/templates/ceph.conf'
--- charmhelpers/contrib/openstack/templates/ceph.conf 2014-02-13 18:16:55 +0000
+++ charmhelpers/contrib/openstack/templates/ceph.conf 2014-03-21 19:44:07 +0000
@@ -3,12 +3,13 @@
3# cinder configuration file maintained by Juju3# cinder configuration file maintained by Juju
4# local changes may be overwritten.4# local changes may be overwritten.
5###############################################################################5###############################################################################
6[global]
6{% if auth -%}7{% if auth -%}
7[global]
8 auth_supported = {{ auth }}8 auth_supported = {{ auth }}
9 keyring = /etc/ceph/$cluster.$name.keyring9 keyring = /etc/ceph/$cluster.$name.keyring
10 mon host = {{ mon_hosts }}10 mon host = {{ mon_hosts }}
11{% endif -%}11{% endif -%}
12log to syslog = {{ use_syslog }}12 log to syslog = {{ use_syslog }}
13err to syslog = {{ use_syslog }}13 err to syslog = {{ use_syslog }}
14clog to syslog = {{ use_syslog }}14 clog to syslog = {{ use_syslog }}
15

Subscribers

People subscribed via source and target branches