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

[Liam Young]

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2016-03-07 07:10:23 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2016-03-11 10:59:16 +0000
@@ -157,12 +157,12 @@
                 if e['name'] == act.name:
                     a = {'enabled': act.enabled, 'name': act.name,
                          'email': act.email, 'id': act.id}
-                    if api_version == 2:
-                        a['tenantId'] = act.tenantId
-                    else:
+                    if api_version == 3:
                         a['default_project_id'] = getattr(act,
                                                           'default_project_id',
                                                           'none')
+                    else:
+                        a['tenantId'] = act.tenantId
                     found = True
                     ret = self._validate_dict_data(e, a)
                     if ret: