docker: add logging(source & groups)

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

diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index ad2fa0f..7987c8d 100644 (file)
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -51,6 +51,9 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   PankoApiPuppetBase:
     type: ../../puppet/services/panko-api.yaml
     properties:
@@ -70,8 +73,13 @@ outputs:
         map_merge:
           - get_attr: [PankoApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [PankoApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [PankoApiPuppetBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [PankoApiPuppetBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [PankoApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -98,7 +106,8 @@ outputs:
             user: root
             volumes:
               - /var/log/containers/panko:/var/log/panko
-            command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko']
+              - /var/log/containers/httpd/panko-api:/var/log/httpd
+            command: ['/bin/bash', '-c', 'chown -R panko:panko /var/log/panko']
         step_3:
           panko_db_sync:
             image: *panko_api_image
@@ -110,8 +119,10 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
+                  - /var/lib/config-data/panko/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/panko/etc/panko:/etc/panko:ro
                   - /var/log/containers/panko:/var/log/panko
+                  - /var/log/containers/httpd/panko-api:/var/log/httpd
             command: "/usr/bin/bootstrap_host_exec panko_api su panko -s /bin/bash -c '/usr/bin/panko-dbsync'"
         step_4:
           panko_api:
@@ -127,6 +138,7 @@ outputs:
                   - /var/lib/kolla/config_files/panko_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/panko/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/panko:/var/log/panko
+                  - /var/log/containers/httpd/panko-api:/var/log/httpd
                   -
                     if:
                       - internal_tls_enabled
@@ -142,7 +154,10 @@ outputs:
       host_prep_tasks:
         - name: create persistent logs directory
           file:
-            path: /var/log/containers/panko
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/panko
+            - /var/log/containers/httpd/panko-api
       metadata_settings:
         get_attr: [PankoApiPuppetBase, role_data, metadata_settings]