Juju Charms Collection
ceph-radosgw package

Merge lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

  1. Trusty Tahr (14.04)
  2. auth_protocol
  3. Merge into next
Proposed by Yaguang Tang
Status: Merged
Merged at revision: 28
Proposed branch: lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+232539@code.launchpad.net

This proposal supersedes a proposal from 2014-08-28.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2014-07-23 11:37:44 +0000
3+++ hooks/hooks.py 2014-08-28 10:56:36 +0000
4@@ -162,7 +162,7 @@
5 for unit in related_units(relid):
6 ks_auth = {
7 'auth_type': 'keystone',
8- 'auth_protocol': 'http',
9+ 'auth_protocol': relation_get('auth_protocol', unit, relid),
10 'auth_host': relation_get('auth_host', unit, relid),
11 'auth_port': relation_get('auth_port', unit, relid),
12 'admin_token': relation_get('admin_token', unit, relid),

Subscribers

People subscribed via source and target branches