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 "TLS everywhere/docker: add nova services to environment"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
mistral-executor.yaml
diff --git
a/docker/services/mistral-executor.yaml
b/docker/services/mistral-executor.yaml
index
ea54c57
..
e106fe4
100644
(file)
--- a/
docker/services/mistral-executor.yaml
+++ b/
docker/services/mistral-executor.yaml
@@
-43,6
+43,9
@@
resources:
ContainersCommon:
type: ./containers-common.yaml
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
MistralBase:
type: ../../puppet/services/mistral-executor.yaml
properties:
MistralBase:
type: ../../puppet/services/mistral-executor.yaml
properties:
@@
-62,7
+65,10
@@
outputs:
map_merge:
- get_attr: [MistralBase, role_data, config_settings]
step_config: &step_config
map_merge:
- get_attr: [MistralBase, role_data, config_settings]
step_config: &step_config
- get_attr: [MistralBase, role_data, step_config]
+ list_join:
+ - "\n"
+ - - {get_attr: [MistralBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config: