summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-29 19:54:54 +0000
committerTarmac <>2011-07-29 19:54:54 +0000
commitbdcfaa5b927a096f507fb0f7e2d81989173957f8 (patch)
treea94a7f9bfb3a863f31f31fee2770bfbfa9bcd086 /nova/log.py
parent6703e33a68d0653f486d679337b4dfc4239eba34 (diff)
parent277b63bd933f0c1bf9209f3c52d1e914fc1d2382 (diff)
downloadnova-bdcfaa5b927a096f507fb0f7e2d81989173957f8.tar.gz
nova-bdcfaa5b927a096f507fb0f7e2d81989173957f8.tar.xz
nova-bdcfaa5b927a096f507fb0f7e2d81989173957f8.zip
Round 1 of changes for keystone integration.
* Modified request context to allow it to hold all of the relevant data from the auth component. * Pulled out access to AuthManager from as many places as possible * Massive cleanup of unit tests * Made the openstack api fakes use fake Authentication by default There are now only a few places that are using auth manager: * Authentication middleware for ec2 api (will move to stand-alone middleware) * Authentication middleware for os api (will be deprecated in favor of keystone) * Accounts and Users apis for os (will be switched to keystone or deprecated) * Ec2 admin api for users and projects (will be removed) * Nova-manage user and project commands (will be deprecated and removed with AuthManager) * Tests that test the above sections (will be converted or removed with their relevant section) * Tests for auth manager * Pipelib (authman can be removed once ec2 stand-alone middleware is in place) * xen_api (for getting images from old objectstore. I think this can be removed) Vish
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/log.py b/nova/log.py
index 133ee45f8..222b8c5fb 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -43,8 +43,8 @@ from nova import version
FLAGS = flags.FLAGS
flags.DEFINE_string('logging_context_format_string',
'%(asctime)s %(levelname)s %(name)s '
- '[%(request_id)s %(user)s '
- '%(project)s] %(message)s',
+ '[%(request_id)s %(user_id)s '
+ '%(project_id)s] %(message)s',
'format string to use for log messages with context')
flags.DEFINE_string('logging_default_format_string',
'%(asctime)s %(levelname)s %(name)s [-] '