Merge "Keystone access log in key-access screen"

This commit is contained in:
Jenkins 2014-09-08 16:23:20 +00:00 committed by Gerrit Code Review
commit ba842f5374
2 changed files with 2 additions and 0 deletions

View File

@ -1616,6 +1616,7 @@ function is_service_enabled {
[[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && enabled=0
[[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0
[[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0
[[ ${service} == key-* && ${ENABLED_SERVICES} =~ "key" ]] && enabled=0
done
$xtrace
return $enabled

View File

@ -476,6 +476,7 @@ function start_keystone {
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
restart_apache_server
screen_it key "cd $KEYSTONE_DIR && sudo tail -f /var/log/$APACHE_NAME/keystone.log"
screen_it key-access "sudo tail -f /var/log/$APACHE_NAME/keystone_access.log"
else
# Start Keystone in a screen window
screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF --debug"