diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-12 19:52:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-12 19:52:01 +0000 |
| commit | 1bf12cc41577c0f0cb3e3fbe99fad538567f0abe (patch) | |
| tree | d16ee8ec7c74f23489b277753afc8538dce35b1a | |
| parent | 0a5f1fe24fefe55b75cd217492a04367128cd548 (diff) | |
| parent | a4043c83caf7713dd930c9285859e911a427b27c (diff) | |
Merge "Changes to show name also for the user list."
| -rw-r--r-- | keystone/manage/__init__.py | 2 | ||||
| -rw-r--r-- | keystone/manage/api.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone/manage/__init__.py b/keystone/manage/__init__.py index 564b2fd4..678e6072 100644 --- a/keystone/manage/__init__.py +++ b/keystone/manage/__init__.py @@ -130,7 +130,7 @@ def process(*args): print "SUCCESS: User %s disabled." % object_id elif (object_type, command) == ('user', 'list'): - print_table(('id', 'enabled', 'tenant'), api.list_users()) + print_table(('id', 'name', 'enabled', 'tenant'), api.list_users()) elif (object_type, command) == ('tenant', 'add'): if api.add_tenant(name=object_id): diff --git a/keystone/manage/api.py b/keystone/manage/api.py index 0d013360..0a3c06bc 100644 --- a/keystone/manage/api.py +++ b/keystone/manage/api.py @@ -28,7 +28,7 @@ def list_users(): objects = db_api.USER.get_all() if objects == None: raise IndexError("No users found") - return [[o.id, o.enabled, o.tenant_id] for o in objects] + return [[o.id, o.name, o.enabled, o.tenant_id] for o in objects] def add_tenant(name): |