Merge lp:~hopem/charms/trusty/ceph-radosgw/lp1515688 into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 50
Proposed branch: lp:~hopem/charms/trusty/ceph-radosgw/lp1515688
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 10 lines (+1/-0)
1 file modified
templates/ceph.conf (+1/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/ceph-radosgw/lp1515688
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+277370@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #12616 ceph-radosgw-next for hopem mp277370
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12616/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #13486 ceph-radosgw-next for hopem mp277370
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13486/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7846 ceph-radosgw-next for hopem mp277370
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7846/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/ceph.conf'
2--- templates/ceph.conf 2015-01-14 16:48:07 +0000
3+++ templates/ceph.conf 2015-11-12 16:33:22 +0000
4@@ -29,5 +29,6 @@
5 rgw keystone accepted roles = {{ user_roles }}
6 rgw keystone token cache size = {{ cache_size }}
7 rgw keystone revocation interval = {{ revocation_check_interval }}
8+rgw s3 auth use keystone = true
9 #nss db path = /var/lib/ceph/nss
10 {% endif %}

Subscribers

People subscribed via source and target branches