valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix adding tenant to keystone user with no previous tenant assigned

Browse Source
This commit is contained in:
Massimiliano Torromeo 2014-04-17 16:46:10 +02:00
parent eb03e88c60
commit c1642db1d0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/states/keystone.py
View File

@ -138,7 +138,8 @@ def user_present(name,
**connection_args)
ret['comment'] = 'User "{0}" has been updated'.format(name)
ret['changes']['Enabled'] = 'Now {0}'.format(enabled)
if tenant and user[name]['tenant_id'] != tenant_id:
if tenant and ('tenant_id' not in user[name] or
user[name]['tenant_id'] != tenant_id):
__salt__['keystone.user_update'](name=name, tenant=tenant,
profile=profile,
**connection_args)