Merge "Unified Apache access log format"

ansible/roles/aodh/templates/wsgi-aodh.conf.j2

@@ -19,7 +19,8 @@ TraceEnable off
   ## Logging
   ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log"
   ServerSignature Off
-  CustomLog "/var/log/kolla/aodh/aodh_wsgi_access.log" combined
+  LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+  CustomLog "/var/log/kolla/aodh/aodh_wsgi_access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
   WSGIProcessGroup aodh

ansible/roles/cinder/templates/cinder-wsgi.conf.j2

@@ -13,5 +13,6 @@ TraceEnable off
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
     ErrorLog /var/log/kolla/cinder/cinder-api.log
-    CustomLog /var/log/kolla/cinder/cinder-api-access.log combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+    CustomLog /var/log/kolla/cinder/cinder-api-access.log logformat
 </VirtualHost>

ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2

@@ -11,7 +11,8 @@ TraceEnable off
     WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py
 
     ErrorLog {{ freezer_log_dir }}/freezer-api.log
-    CustomLog {{ freezer_log_dir }}/freezer-api_access.log combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+    CustomLog {{ freezer_log_dir }}/freezer-api_access.log logformat
     LogLevel info
 
     <Directory {{ python_path }}/freezer_api>

ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2

@@ -7,7 +7,8 @@ TraceEnable off
 <VirtualHost *:{{ gnocchi_api_port }}>
 
   ErrorLog "/var/log/kolla/gnocchi/gnocchi-api-error.log"
-  CustomLog "/var/log/kolla/gnocchi/gnocchi-api-access.log" combined
+  LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+  CustomLog "/var/log/kolla/gnocchi/gnocchi-api-access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }}
   WSGIProcessGroup gnocchi

ansible/roles/horizon/templates/horizon.conf.j2

@@ -6,7 +6,8 @@ TraceEnable off
 <VirtualHost *:{{ horizon_port }}>
     LogLevel warn
     ErrorLog /var/log/kolla/horizon/horizon.log
-    CustomLog /var/log/kolla/horizon/horizon-access.log combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+    CustomLog /var/log/kolla/horizon/horizon-access.log logformat
 
     WSGIScriptReloading On
     WSGIDaemonProcess horizon-http processes={{ openstack_service_workers }} threads=1 user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }}

ansible/roles/panko/templates/wsgi-panko.conf.j2

@@ -6,7 +6,8 @@ TraceEnable off
 <VirtualHost *:{{ panko_api_port }}>
 
   ErrorLog "/var/log/kolla/panko/panko-api-error.log"
-  CustomLog "/var/log/kolla/panko/panko-api-access.log" combined
+  LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+  CustomLog "/var/log/kolla/panko/panko-api-access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }}
   WSGIProcessGroup panko

ansible/roles/zun/templates/wsgi-zun.conf.j2

@@ -19,7 +19,8 @@ TraceEnable off
   ## Logging
   ErrorLog "/var/log/kolla/zun/zun_api_wsgi_error.log"
   ServerSignature Off
-  CustomLog "/var/log/kolla/zun/zun_api_wsgi_access.log" combined
+  LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
+  CustomLog "/var/log/kolla/zun/zun_api_wsgi_access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess zun group=zun processes={{ openstack_service_workers }} threads=1 user=zun python-path={{ python_path }}
   WSGIProcessGroup zun