Merge "Fix wrong permission on database during mysql_init tasks." into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / gnocchi-api.yaml

diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 1443da4..96f6ab9 100644 (file)
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -71,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [GnocchiApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [GnocchiApiPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]}
@@ -104,7 +106,8 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/gnocchi:/var/log/gnocchi
-            command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi']
+              - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
+            command: ['/bin/bash', '-c', 'chown -R gnocchi:gnocchi /var/log/gnocchi']
         step_4:
           gnocchi_db_sync:
             image: *gnocchi_api_image
@@ -119,6 +122,7 @@ outputs:
                   - /var/lib/config-data/gnocchi/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi
+                  - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
                   - /etc/ceph:/etc/ceph:ro
             command:
               str_replace:
@@ -138,6 +142,7 @@ outputs:
                   - /var/lib/kolla/config_files/gnocchi_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi
+                  - /var/log/containers/httpd/gnocchi-api:/var/log/httpd
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   -
                     if:
@@ -154,8 +159,11 @@ outputs:
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/gnocchi
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/gnocchi
+            - /var/log/containers/httpd/gnocchi-api
         - name: ensure ceph configurations exist
           file:
             path: /etc/ceph