Charm Helpers

Merge lp:~gnuoy/charm-helpers/validate_users into lp:charm-helpers

  1. validate_users
  2. Merge into devel
Proposed by Liam Young
Status: Merged
Merged at revision: 546
Proposed branch: lp:~gnuoy/charm-helpers/validate_users
Merge into: lp:charm-helpers
Diff against target: 19 lines (+3/-3)
1 file modified
charmhelpers/contrib/openstack/amulet/utils.py (+3/-3)
To merge this branch: bzr merge lp:~gnuoy/charm-helpers/validate_users
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+288753@code.launchpad.net
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 'charmhelpers/contrib/openstack/amulet/utils.py'
2--- charmhelpers/contrib/openstack/amulet/utils.py 2016-03-07 07:10:23 +0000
3+++ charmhelpers/contrib/openstack/amulet/utils.py 2016-03-11 10:59:16 +0000
4@@ -157,12 +157,12 @@
5 if e['name'] == act.name:
6 a = {'enabled': act.enabled, 'name': act.name,
7 'email': act.email, 'id': act.id}
8- if api_version == 2:
9- a['tenantId'] = act.tenantId
10- else:
11+ if api_version == 3:
12 a['default_project_id'] = getattr(act,
13 'default_project_id',
14 'none')
15+ else:
16+ a['tenantId'] = act.tenantId
17 found = True
18 ret = self._validate_dict_data(e, a)
19 if ret:

Subscribers

People subscribed via source and target branches