commit 1577663f4a7d50542e1c729a3f975af627f6c47b
author Anand Shanmugam <anand1712@gmail.com> Sat Mar 14 19:24:10 2015 +0530
committer Anand Shanmugam <anand1712@gmail.com> Sun Mar 15 08:51:55 2015 +0000
tree dd56ea11530a6061c88edc25d32263ba9d682d06
parent f6fd39f9743cf0eb3be017c907bbe5b3ba2873ee

Fix Traceback exceptions in g-api and g-reg

The log_context format specified in glance-api and glance-reistry
are causing tracebacks.  This fix changes the
project_id and user_id to tenant and user which are supported
in oslo-context.  This is the format used by other projects

Change-Id: Ifbf268e9765039a0085c9af930dabf8a5cc681b8
Closes-Bug: #1431784

lib/glance

diff --git a/lib/glance b/lib/glance
index eb1df2e..26d7960 100755
--- a/lib/glance
+++ b/lib/glance
@@ -185,8 +185,8 @@
 
     # Format logging
     if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
-        setup_colorized_logging $GLANCE_API_CONF DEFAULT "project_id" "user_id"
-        setup_colorized_logging $GLANCE_REGISTRY_CONF DEFAULT "project_id" "user_id"
+        setup_colorized_logging $GLANCE_API_CONF DEFAULT tenant user
+        setup_colorized_logging $GLANCE_REGISTRY_CONF DEFAULT tenant user
     fi
 
     cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI