diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-05 15:17:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-05 15:17:55 +0000 |
| commit | 574617d007b02f98b2ac9b7e853cf4fd266fe085 (patch) | |
| tree | 5a6069263cc5160b1051078370ae15785add0cd8 /docker/services/heat-engine.yaml | |
| parent | c577755082a92e638ca03ae8a8bd38045bf7901c (diff) | |
| parent | 58a8b282c2f244b2675a6da7aac161a53f58c288 (diff) | |
Merge "Mount hostpath logs on /var/log"
Diffstat (limited to 'docker/services/heat-engine.yaml')
| -rw-r--r-- | docker/services/heat-engine.yaml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index ced81561..da0552af 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -64,9 +64,22 @@ outputs: 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 + permissions: + - path: /var/log/heat + owner: heat:heat + recurse: true docker_config: + # db sync runs before permissions set by kolla_config step_3: + heat_init_log: + start_order: 0 + image: *heat_engine_image + user: root + volumes: + - /var/log/containers/heat:/var/log/heat + command: ['/bin/bash', '-c', 'chown -R heat:heat /var/log/heat'] heat_engine_db_sync: + start_order: 1 image: *heat_engine_image net: host privileged: false @@ -76,6 +89,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro + - /var/log/containers/heat:/var/log/heat command: ['heat-manage', 'db_sync'] step_4: heat_engine: @@ -89,9 +103,14 @@ outputs: - - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro - - /run:/run + - /var/log/containers/heat:/var/log/heat environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + host_prep_tasks: + - name: create persistent logs directory + file: + path: /var/log/containers/heat + state: directory upgrade_tasks: - name: Stop and disable heat_engine service tags: step2 |