Charm Helpers

Merge lp:~thedac/charm-helpers/fix-suffix-select into lp:charm-helpers

  1. fix-suffix-select
  2. Merge into devel
Proposed by David Ames
Status: Merged
Merged at revision: 748
Proposed branch: lp:~thedac/charm-helpers/fix-suffix-select
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/openstack/keystone.py (+1/-1)
To merge this branch: bzr merge lp:~thedac/charm-helpers/fix-suffix-select
Reviewer Review Type Date Requested Status
Billy Olsen Approve
charmers Pending
Review via email: mp+324893@code.launchpad.net

Description of the change

Fix Keystone version suffix selection

To post a comment you must log in.
Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM, however I can't merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/keystone.py'
2--- charmhelpers/contrib/openstack/keystone.py 2017-02-28 17:11:01 +0000
3+++ charmhelpers/contrib/openstack/keystone.py 2017-05-31 23:31:12 +0000
4@@ -29,7 +29,7 @@
5 @returns the api suffix formatted according to the given api
6 version
7 """
8- return 'v2.0' if api_version in (2, "2.0") else 'v3'
9+ return 'v2.0' if api_version in (2, "2", "2.0") else 'v3'
10
11
12 def format_endpoint(schema, addr, port, api_version):

Subscribers

People subscribed via source and target branches