Charm Helpers

Merge lp://staging/~thedac/charm-helpers/get-catalog into lp://staging/charm-helpers

get-catalog
Merge into devel

Proposed by David Ames on 2017-06-09

Status:	Merged
Merged at revision:	752
Proposed branch:	lp://staging/~thedac/charm-helpers/get-catalog
Merge into:	lp://staging/charm-helpers
Diff against target:	133 lines (+42/-38) 1 file modified charmhelpers/contrib/openstack/amulet/utils.py (+42/-38)
To merge this branch:	bzr merge lp://staging/~thedac/charm-helpers/get-catalog
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Edward Hope-Morley		2017-06-09	Approve on 2017-06-12
Review via email: mp+325427@code.staging.launchpad.net

Description of the change

Update use of client.service_catalog with sessions

Due to a bug in keystone client when using keystoneauth1.sessions
keystoneclient.service_catalog is no longer populated automatically.

Manually setting client.auth_ref has the side effect of populating
the service_catalog and has become the undocumented but accepted
practice.

This change adds the manual setting of auth_ref and updates the query
arguments for url_for().

Revision history for this message

Alex Kavanagh (ajkavanagh) wrote on 2017-06-12:

Unless something has changed, and it may well have done, then this is in response to https://bugs.launchpad.net/python-keystoneclient/+bug/1547331 which is about v3 keystone client having the missing service_catalog?

If so, the get_access() method forces a pre-auth and if placed on the keystone client, will then get the service catalog:

e.g.

    auth = keystoneclient.auth.identity.v3.Password(...)
    sess = keystoneclient.session.Session(auth=auth)
    keystone = keystone.v3.client.Client(session=sess)
    keystone.auth_ref = auth.get_access(sess)

At this point the keystone variable can be used to get the catalog:

keystone.service_catalog.get_endpoints()

This works (for v3) as it is in the Barbican charm's keystone v3 code. It's also backwards compatible with the v2_0 client if v2.Password(...) is used.

See https://github.com/openstack/charm-barbican/blob/master/src/tests/basic_deployment.py#L142 as an example?

However, if this isn't the use case, then sorry for the interruption!

Revision history for this message

David Ames (thedac) wrote on 2017-06-12:

To be clear I this now implements Alex's proposed changes.

lp://staging/~thedac/charm-helpers/get-catalog updated on 2017-06-12