From ea1fd5967ab7c97df66474f0b2598a4167da551a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fran=C3=A7oise?= Date: Tue, 31 Jan 2017 11:07:03 +0100 Subject: [PATCH] Fix context error for user In this changeset, I fixed an error in the Watcher RequestContext that was introduced by the release of oslo.context==2.12.X which makes user_id an alias of user (among others) https://github.com/openstack/oslo.context/blob/2.12.1/oslo_context/context.py#L258-L269 Change-Id: I4e35c675de7ee01db90f700eece0b28413b34c47 --- watcher/common/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watcher/common/context.py b/watcher/common/context.py index d357e7e05..1d980c6af 100644 --- a/watcher/common/context.py +++ b/watcher/common/context.py @@ -75,7 +75,7 @@ class RequestContext(context.RequestContext): self.domain_name = domain_name self.domain_id = domain_id self.auth_token_info = auth_token_info - self.user_id = user_id + self.user_id = user_id or user self.project_id = project_id if not timestamp: timestamp = timeutils.utcnow()