@@ -3,13 +3,7 @@ Listen %ADMINPORT%

 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" keystone_combined

 <Directory %KEYSTONE_BIN%>

-    <IfVersion >= 2.4>

-        Require all granted

-    </IfVersion>

-    <IfVersion < 2.4>

-        Order allow,deny

-        Allow from all

-    </IfVersion>

+    Require all granted

 </Directory>

 <VirtualHost *:%PUBLICPORT%>

@@ -18,9 +12,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"

     WSGIScriptAlias / %KEYSTONE_BIN%/keystone-wsgi-public

     WSGIApplicationGroup %{GLOBAL}

     WSGIPassAuthorization On

-    <IfVersion >= 2.4>

-      ErrorLogFormat "%{cu}t %M"

-    </IfVersion>

+    ErrorLogFormat "%M"

     ErrorLog /var/log/%APACHE_NAME%/keystone.log

     CustomLog /var/log/%APACHE_NAME%/keystone_access.log keystone_combined

     %SSLENGINE%

@@ -34,9 +26,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"

     WSGIScriptAlias / %KEYSTONE_BIN%/keystone-wsgi-admin

     WSGIApplicationGroup %{GLOBAL}

     WSGIPassAuthorization On

-    <IfVersion >= 2.4>

-      ErrorLogFormat "%{cu}t %M"

-    </IfVersion>

+    ErrorLogFormat "%M"

     ErrorLog /var/log/%APACHE_NAME%/keystone.log

     CustomLog /var/log/%APACHE_NAME%/keystone_access.log keystone_combined

     %SSLENGINE%

@@ -299,11 +299,10 @@ function configure_keystone {

     iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then

-        # Eliminate the %(asctime)s.%(msecs)03d from the log format strings

-        iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"

-        iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"

-        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(funcName)s %(pathname)s:%(lineno)d"

-        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(process)d TRACE %(name)s %(instance)s"

+        iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"

+        iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"

+        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(asctime)s.%(msecs)03d %(funcName)s %(pathname)s:%(lineno)d"

+        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s"

         _config_keystone_apache_wsgi

     else

         iniset $KEYSTONE_CONF eventlet_server admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST"