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 "Move mistral into services-docker"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-metadata.yaml
diff --git
a/docker/services/nova-metadata.yaml
b/docker/services/nova-metadata.yaml
index
a4baaa2
..
b452c61
100644
(file)
--- a/
docker/services/nova-metadata.yaml
+++ b/
docker/services/nova-metadata.yaml
@@
-37,12
+37,14
@@
outputs:
config_settings:
map_merge:
- get_attr: [NovaMetadataBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [NovaMetadataBase, role_data, config_settings]
- step_config: {get_attr: [NovaMetadataBase, role_data, step_config]}
+ step_config: &step_config
+ get_attr: [NovaMetadataBase, role_data, step_config]
service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
- docker_image: ''
- puppet_tags: ''
- config_volume: ''
- config_image: ''
+ puppet_config:
+ config_volume: ''
+ puppet_tags: ''
+ step_config: *step_config
+ config_image: ''
kolla_config: {}
docker_config: {}
kolla_config: {}
docker_config: {}