diff options
Diffstat (limited to 'trove/taskmanager')
| -rw-r--r-- | trove/taskmanager/manager.py | 2 | ||||
| -rwxr-xr-x | trove/taskmanager/models.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/trove/taskmanager/manager.py b/trove/taskmanager/manager.py index a7a16493..bb6a5da7 100644 --- a/trove/taskmanager/manager.py +++ b/trove/taskmanager/manager.py @@ -44,7 +44,7 @@ class Manager(periodic_task.PeriodicTasks): def __init__(self): super(Manager, self).__init__(CONF) self.admin_context = TroveContext( - user=CONF.service_credentials.username, + user_id=CONF.service_credentials.username, project_id=CONF.service_credentials.project_id, user_domain_name=CONF.service_credentials.user_domain_name) if CONF.exists_notification_transformer: diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 58dd8f2b..fcfa2827 100755 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -116,7 +116,7 @@ class NotifyMixin(object): 'state_description': self.status, 'state': self.status, 'tenant_id': self.tenant_id, - 'user_id': self.context.user, + 'user_id': self.context.user_id, } if CONF.get(self.datastore_version.manager).volume_support: @@ -980,7 +980,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): nics, files={}, scheduler_hints=None): userdata = self.prepare_userdata(datastore_manager) metadata = {'trove_project_id': self.tenant_id, - 'trove_user_id': self.context.user, + 'trove_user_id': self.context.user_id, 'trove_instance_id': self.id} bdmap_v2 = block_device_mapping_v2 config_drive = CONF.use_nova_server_config_drive |