Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
fdba7d5
..
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
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
resources:
ContainersCommon:
@@
-65,6
+64,8
@@
outputs:
map_merge:
- get_attr: [HeatBase, role_data, config_settings]
- apache::default_vhost: false
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"
step_config: &step_config
list_join:
- "\n"