zuul-web: move LogFormat combined-cache into config

These two values overwrite each other, move into common configuration.

The "cache-status" is a verbose string, so quote it.

Change-Id: I3cc4627de3d6a0de1adcfed6b424fc3ed0099245

playbooks/roles/zuul-web/files/log-combined-cache.conf

@@ -0,0 +1,2 @@
+LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b \"%{cache-status}e\" \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
+

playbooks/roles/zuul-web/tasks/main.yaml

@@ -29,6 +29,16 @@
     - 50-zuul.openstack.org.conf
     - 50-zuul.openstack.org-http.conf
 
+- name: Copy common log configuration
+  copy:
+    src: log-combined-cache.conf
+    dest: /etc/apache2/conf-available
+  register: _log_combined_cache
+
+- name: Enable combined cache log config
+  command: a2enconf log-combined-cache
+  when: _log_combined_cache.changed
+
 - name: Copy apache config
   template:
     src: zuul.vhost.j2

playbooks/roles/zuul-web/templates/openstack.vhost.j2

@@ -1,7 +1,3 @@
-{% raw %}
-LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
-{% endraw %}
-
 <VirtualHost *:80>
   ServerName zuul.openstack.org
   ServerAdmin webmaster@openstack.org

playbooks/roles/zuul-web/templates/zuul.vhost.j2

@@ -1,7 +1,3 @@
-{% raw %}
-LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
-{% endraw %}
-
 <VirtualHost *:80>
   ServerName zuul.opendev.org
   ServerAdmin webmaster@openstack.org