Merge lp://staging/~james-page/charm-helpers/ensure-ceph-keyring into lp://staging/charm-helpers

Proposed by James Page
Status: Merged
Merged at revision: 726
Proposed branch: lp://staging/~james-page/charm-helpers/ensure-ceph-keyring
Merge into: lp://staging/charm-helpers
Diff against target: 54 lines (+21/-8)
2 files modified
charmhelpers/contrib/storage/linux/ceph.py (+10/-8)
tests/contrib/storage/test_linux_ceph.py (+11/-0)
To merge this branch: bzr merge lp://staging/~james-page/charm-helpers/ensure-ceph-keyring
Reviewer Review Type Date Requested Status
Alex Kavanagh (community) Approve
charmers Pending
Review via email: mp+321291@code.staging.launchpad.net

Description of the change

Allow callers to pass a key directly to ensure_ceph_keyring, allowing
multiplicity in relations providing ceph keys (as found with the
ceph-access relation).

To post a comment you must log in.
Revision history for this message
Alex Kavanagh (ajkavanagh) wrote :

LGTM. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches