Add volume for Horizon logs for heka collecting

Plus small refactoring of openstack-dashboard template

Change-Id: Ib62ace1db43fb2c9125a890575fb901646b76e53

docker/horizon/Dockerfile.j2

@@ -23,4 +23,6 @@ RUN mv horizon*/ horizon-{{ branch }}/ \
 ENV PATH /var/lib/venv/bin:$PATH
 
 COPY daemon.sh /usr/local/bin/daemon.sh
-RUN chmod 755 /usr/local/bin/daemon.sh
+COPY horizon_sudoers /etc/sudoers.d/horizon_sudoers
+RUN chmod 755 /usr/local/bin/daemon.sh \
+    && chmod 440 /etc/sudoers.d/horizon_sudoers

docker/horizon/horizon_sudoers

@@ -0,0 +1 @@
+%microservices ALL=(root) NOPASSWD: /bin/chown horizon\:horizon /var/log/ccp/horizon

service/files/openstack-dashboard.conf.j2

@@ -1,15 +1,26 @@
-WSGIScriptAlias / /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-WSGIScriptAlias /horizon /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 python-path=/var/lib/microservices/venv/lib/python2.7/site-packages
-WSGIProcessGroup horizon
-Alias /static /var/lib/microservices/venv/local/lib/python2.7/site-packages/static
-<Directory /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/wsgi>
-  Order allow,deny
-  Allow from all
-  Require all granted
-</Directory>
-<Directory /var/lib/microservices/venv/local/lib/python2.7/site-packages/static>
-  Order allow,deny
-  Allow from all
-  Require all granted
-</Directory>
+{% set venv_path = '/var/lib/microservices/venv/lib/python2.7/site-packages' %}
+
+<VirtualHost *:{{ horizon_port }}>
+    WSGIScriptAlias / {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
+    WSGIScriptAlias /horizon {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
+    WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 python-path={{ venv_path }}
+    WSGIProcessGroup horizon
+
+    Alias /static {{ venv_path }}/static
+
+    <Directory {{ venv_path }}/openstack_dashboard/wsgi>
+        Order allow,deny
+        Allow from all
+        Require all granted
+    </Directory>
+    <Directory {{ venv_path }}/static>
+        Order allow,deny
+        Allow from all
+        Require all granted
+    </Directory>
+
+    ErrorLogFormat "%{cu}t %-m:%-l %P:%T %M"
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" access
+    ErrorLog  "/var/log/ccp/horizon/horizon-error.log"
+    CustomLog "/var/log/ccp/horizon/horizon-access.log" access
+</VirtualHost>

service/horizon.yaml

@@ -8,7 +8,14 @@ service:
       probes:
         readiness: "true"
         liveness: "true"
+      volumes:
+      - name: horizon-logs
+        path: "/var/log/ccp/horizon"
+        type: host
+        readOnly: False
       pre:
+        - name: chown-logs-dir
+          command: "sudo /bin/chown horizon:horizon /var/log/ccp/horizon"
         - name: horizon-compress
           command: /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py compress --force
       daemon: