summaryrefslogtreecommitdiffstats
path: root/docker/services/heat-engine.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-04 23:29:12 +0000
committerGerrit Code Review <review@openstack.org>2017-04-04 23:29:13 +0000
commitac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch)
treed0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/heat-engine.yaml
parent1b09a3d6e295f602c118c6656d1abce8614f915c (diff)
parent91e7a548cb4e39e72798c8cda16f3a946128a419 (diff)
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/heat-engine.yaml')
-rw-r--r--docker/services/heat-engine.yaml15
1 files changed, 5 insertions, 10 deletions
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 85a00b1d..83c63095 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -59,13 +59,8 @@ outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
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
- config_files:
- - dest: /etc/heat/heat.conf
- owner: heat
- perm: '0640'
- source: /var/lib/kolla/config_files/src/etc/heat/heat.conf
+ /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
docker_config:
step_3:
heat_engine_db_sync:
@@ -74,7 +69,7 @@ outputs:
privileged: false
detach: false
volumes:
- - /var/lib/config-data/heat/etc/heat:/etc/heat:ro
+ - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
command: ['heat-manage', 'db_sync']
@@ -85,11 +80,11 @@ outputs:
privileged: false
restart: always
volumes:
- - /run:/run
- /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/heat/:/var/lib/kolla/config_files/src:ro
+ - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
+ - /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks: