From f171eca4c3fc2e18b3971bb9cd930208bf43e646 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Wed, 2 Aug 2017 11:44:18 +0200
Subject: Persist containerized services httpd logs

Store the httpd logs under dedicated /var/log/containers/httpd/
paths.
Additionally, add release notes describing upgrade impact
for containerized services logs.

Closes-bug: #1700045

Change-Id: I8120c56f2315700862bd0f708b8baa8910275b09
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 287e84585ca9170570ce8d06eebd7f9a3ec3345c)
---
 docker/services/neutron-api.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'docker/services/neutron-api.yaml')

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index 85a07128..c028fc28 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -110,6 +110,7 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/neutron:/var/log/neutron
+              - /var/log/containers/httpd/neutron-api:/var/log/httpd
             command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron']
         step_3:
           neutron_db_sync:
@@ -126,6 +127,7 @@ outputs:
                   - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
                   - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
                   - /var/log/containers/neutron:/var/log/neutron
+                  - /var/log/containers/httpd/neutron-api:/var/log/httpd
             command: ['/usr/bin/bootstrap_host_exec', 'neutron_api', 'neutron-db-manage', 'upgrade', 'heads']
             # FIXME: we should make config file permissions right
             # and run as neutron user
@@ -144,6 +146,7 @@ outputs:
                       - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
                       - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/neutron:/var/log/neutron
+                      - /var/log/containers/httpd/neutron-api:/var/log/httpd
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - if:
@@ -167,8 +170,11 @@ outputs:
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/neutron
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/neutron
+            - /var/log/containers/httpd/neutron-api
       upgrade_tasks:
         - name: Check if neutron_server is deployed
           command: systemctl is-enabled neutron-server
-- 
cgit 1.2.3-korg