diff options
Diffstat (limited to 'trove/common')
| -rw-r--r-- | trove/common/clients.py | 4 | ||||
| -rw-r--r-- | trove/common/notification.py | 2 | ||||
| -rw-r--r-- | trove/common/wsgi.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/trove/common/clients.py b/trove/common/clients.py index af24f15e..40a5136f 100644 --- a/trove/common/clients.py +++ b/trove/common/clients.py @@ -102,7 +102,7 @@ def nova_client(context, region_name=None, password=None): ) client = Client(CONF.nova_client_version, - username=context.user, + username=context.user_id, password=password, endpoint_override=url, project_id=context.project_id, @@ -141,7 +141,7 @@ def cinder_client(context, region_name=None): endpoint_type=CONF.cinder_endpoint_type ) - client = CinderClient.Client(context.user, context.auth_token, + client = CinderClient.Client(context.user_id, context.auth_token, project_id=context.project_id, auth_url=CONF.service_credentials.auth_url, insecure=CONF.cinder_api_insecure) diff --git a/trove/common/notification.py b/trove/common/notification.py index a050e0a7..65d1894a 100644 --- a/trove/common/notification.py +++ b/trove/common/notification.py @@ -115,7 +115,7 @@ class TroveBaseTraits(object): 'state_description': instance.status.lower(), 'state': instance.status.lower(), 'tenant_id': instance.tenant_id, - 'user_id': instance.context.user, + 'user_id': instance.context.user_id, }) self.payload.update(kwargs) diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py index 72fcfc1f..5231811d 100644 --- a/trove/common/wsgi.py +++ b/trove/common/wsgi.py @@ -549,7 +549,7 @@ class ContextMiddleware(base_wsgi.Middleware): limits = self._extract_limits(request.params) context = rd_context.TroveContext(auth_token=auth_token, project_id=tenant_id, - user=user_id, + user_id=user_id, is_admin=is_admin, limit=limits.get('limit'), marker=limits.get('marker'), |