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

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

diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index a20dc13..21ae242 100644 (file)
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -65,6 +64,8 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"
@@ -109,6 +110,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
+                  - /var/lib/config-data/heat/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
                   - /var/log/containers/heat:/var/log/heat
             command: "/usr/bin/bootstrap_host_exec heat_engine su heat -s /bin/bash -c 'heat-manage db_sync'"