diff options
author | asteroide <thomas.duval@orange.com> | 2015-12-02 09:49:33 +0100 |
---|---|---|
committer | asteroide <thomas.duval@orange.com> | 2015-12-02 10:25:15 +0100 |
commit | 7a5a0e4df646d46476ec7a9fcdedd638e8781f6e (patch) | |
tree | 54eecd1210e4fb5db2b14edeac1df601da7698e2 /keystone-moon/keystone/identity | |
parent | 8d7b0ffa8e7a7bb09686d8f25176c364d5b6aa0e (diff) |
Update keystone to the branch stable/liberty.
Change-Id: I7cce62ae4b4cbca525a7b9499285455bdd04993e
Diffstat (limited to 'keystone-moon/keystone/identity')
-rw-r--r-- | keystone-moon/keystone/identity/controllers.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/keystone-moon/keystone/identity/controllers.py b/keystone-moon/keystone/identity/controllers.py index 7a6a642a..0ec38190 100644 --- a/keystone-moon/keystone/identity/controllers.py +++ b/keystone-moon/keystone/identity/controllers.py @@ -82,8 +82,9 @@ class User(controller.V2Controller): # The manager layer will generate the unique ID for users user_ref = self._normalize_domain_id(context, user.copy()) + initiator = notifications._get_request_audit_info(context) new_user_ref = self.v3_to_v2_user( - self.identity_api.create_user(user_ref)) + self.identity_api.create_user(user_ref, initiator)) if default_project_id is not None: self.assignment_api.add_user_to_project(default_project_id, @@ -120,8 +121,9 @@ class User(controller.V2Controller): # user update. self.resource_api.get_project(default_project_id) + initiator = notifications._get_request_audit_info(context) user_ref = self.v3_to_v2_user( - self.identity_api.update_user(user_id, user)) + self.identity_api.update_user(user_id, user, initiator)) # If 'tenantId' is in either ref, we might need to add or remove the # user from a project. @@ -166,7 +168,8 @@ class User(controller.V2Controller): @controller.v2_deprecated def delete_user(self, context, user_id): self.assert_admin(context) - self.identity_api.delete_user(user_id) + initiator = notifications._get_request_audit_info(context) + self.identity_api.delete_user(user_id, initiator) @controller.v2_deprecated def set_user_enabled(self, context, user_id, user): |