summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-25 21:28:22 +0000
committerGerrit Code Review <review@openstack.org>2017-07-25 21:28:22 +0000
commit0ea4dfc869b9d3438d02a2cc82aeceab32bb8998 (patch)
tree7b3b1ae6ff415c5cb70c3001bed4f92fcc97f157 /docker
parentec25c792d73c4a4b6e14ddfa0ffa385211fa1a29 (diff)
parent3f310259b931d43aa7f411db1f84c88a5d730739 (diff)
Merge "Add heat api container to run cron purge_deleted"
Diffstat (limited to 'docker')
-rw-r--r--docker/services/heat-api.yaml25
1 files changed, 25 insertions, 0 deletions
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index d09230fe..ba8fc75f 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -90,6 +90,17 @@ outputs:
- path: /var/log/heat
owner: heat:heat
recurse: true
+ /var/lib/kolla/config_files/heat_api_cron.json:
+ command: /usr/sbin/crond -n
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
+ permissions:
+ - path: /var/log/heat
+ owner: heat:heat
+ recurse: true
docker_config:
step_4:
heat_api:
@@ -119,6 +130,20 @@ outputs:
- ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ heat_api_cron:
+ image: {get_param: DockerHeatApiImage}
+ net: host
+ privileged: false
+ restart: always
+ volumes:
+ list_concat:
+ - {get_attr: [ContainersCommon, volumes]}
+ -
+ - /var/lib/kolla/config_files/heat_api_cron.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
+ - /var/log/containers/heat:/var/log/heat
+ environment:
+ - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
- name: create persistent logs directory
file: