Charm Helpers

Merge lp:~chris.macnaughton/charm-helpers/default-rbd-features into lp:charm-helpers

  1. default-rbd-features
  2. Merge into devel
Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 765
Proposed branch: lp:~chris.macnaughton/charm-helpers/default-rbd-features
Merge into: lp:charm-helpers
Diff against target: 34 lines (+6/-1)
2 files modified
charmhelpers/contrib/openstack/context.py (+2/-0)
charmhelpers/contrib/openstack/templates/ceph.conf (+4/-1)
To merge this branch: bzr merge lp:~chris.macnaughton/charm-helpers/default-rbd-features
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Pen Gale Pending
Chris MacNaughton Pending
Review via email: mp+327518@code.launchpad.net

This proposal supersedes a proposal from 2017-06-29.

To post a comment you must log in.
Revision history for this message
Pen Gale (pengale) wrote : Posted in a previous version of this proposal

This is what I expected, based on conversations in the Openstack team sync. +1

review: Approve
Revision history for this message
Chris MacNaughton (chris.macnaughton) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Chris MacNaughton (chris.macnaughton) : Posted in a previous version of this proposal
review: Needs Resubmitting
Revision history for this message
David Ames (thedac) wrote :

Sounds like the testing went well.

Looks good. Merging.

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/context.py'
2--- charmhelpers/contrib/openstack/context.py 2017-07-05 10:31:39 +0000
3+++ charmhelpers/contrib/openstack/context.py 2017-07-17 12:38:37 +0000
4@@ -510,6 +510,8 @@
5 ctxt['auth'] = relation_get('auth', rid=rid, unit=unit)
6 if not ctxt.get('key'):
7 ctxt['key'] = relation_get('key', rid=rid, unit=unit)
8+ if not ctxt.get('rbd_features'):
9+ ctxt['rbd_features'] = relation_get('rbd-features', rid=rid, unit=unit)
10
11 ceph_addrs = relation_get('ceph-public-address', rid=rid,
12 unit=unit)
13
14=== modified file 'charmhelpers/contrib/openstack/templates/ceph.conf'
15--- charmhelpers/contrib/openstack/templates/ceph.conf 2015-07-14 09:18:09 +0000
16+++ charmhelpers/contrib/openstack/templates/ceph.conf 2017-07-17 12:38:37 +0000
17@@ -1,6 +1,6 @@
18 ###############################################################################
19 # [ WARNING ]
20-# cinder configuration file maintained by Juju
21+# ceph configuration file maintained by Juju
22 # local changes may be overwritten.
23 ###############################################################################
24 [global]
25@@ -12,6 +12,9 @@
26 log to syslog = {{ use_syslog }}
27 err to syslog = {{ use_syslog }}
28 clog to syslog = {{ use_syslog }}
29+{% if rbd_features %}
30+rbd default features = {{ rbd_features }}
31+{% endif %}
32
33 [client]
34 {% if rbd_client_cache_settings -%}

Subscribers

People subscribed via source and target branches