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
Bind mount needed cert for haproxy for HA too
[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
0adad53
..
676dbb1
100644
(file)
--- a/
docker/services/heat-engine.yaml
+++ b/
docker/services/heat-engine.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-heat-engine:latest'
type: string
description: image
default: 'centos-binary-heat-engine:latest'
type: string
+ DockerHeatConfigImage:
+ description: The container image to use for the heat config_volume
+ default: 'centos-binary-heat-api:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-67,10
+71,10
@@
outputs:
config_volume: heat
puppet_tags: heat_config,file,concat,file_line
step_config: *step_config
config_volume: heat
puppet_tags: heat_config,file,concat,file_line
step_config: *step_config
- config_image:
&heat_engine_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHeat
Engine
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerHeat
Config
Image} ]
kolla_config:
/var/lib/kolla/config_files/heat_engine.json:
command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
kolla_config:
/var/lib/kolla/config_files/heat_engine.json:
command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
@@
-80,16
+84,18
@@
outputs:
recurse: true
docker_config:
# db sync runs before permissions set by kolla_config
recurse: true
docker_config:
# db sync runs before permissions set by kolla_config
- step_
3
:
+ step_
2
:
heat_init_log:
heat_init_log:
- start_order: 0
- image: *heat_engine_image
+ image: &heat_engine_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
user: root
volumes:
- /var/log/containers/heat:/var/log/heat
command: ['/bin/bash', '-c', 'chown -R heat:heat /var/log/heat']
user: root
volumes:
- /var/log/containers/heat:/var/log/heat
command: ['/bin/bash', '-c', 'chown -R heat:heat /var/log/heat']
+ step_3:
heat_engine_db_sync:
heat_engine_db_sync:
- start_order: 1
image: *heat_engine_image
net: host
privileged: false
image: *heat_engine_image
net: host
privileged: false