← Back to branch summary

~hopem/charms/trusty/ceph-radosgw/lp1449279-stable-backport

« back to all changes in this revision

Viewing changes to hooks/hooks.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-06 22:19:10 UTC
  • mfrom: (24.2.1 ceph-radosgw)
  • Revision ID: james.page@ubuntu.com-20141006221910-ebotjgooepxzenef
[yaguang,r=james-page] Get keystone endpoint auth protocol from keystone

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/hooks.py
162
162
        for unit in related_units(relid):
163
163
            ks_auth = {
164
164
                'auth_type': 'keystone',
165
 
                'auth_protocol': 'http',
 
165
                'auth_protocol':
 
166
                relation_get('auth_protocol', unit, relid) or "http",
166
167
                'auth_host': relation_get('auth_host', unit, relid),
167
168
                'auth_port': relation_get('auth_port', unit, relid),
168
169
                'admin_token': relation_get('admin_token', unit, relid),