diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-04 23:29:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-04 23:29:13 +0000 |
commit | ac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch) | |
tree | d0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/heat-api.yaml | |
parent | 1b09a3d6e295f602c118c6656d1abce8614f915c (diff) | |
parent | 91e7a548cb4e39e72798c8cda16f3a946128a419 (diff) |
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/heat-api.yaml')
-rw-r--r-- | docker/services/heat-api.yaml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 12884f56..3212d909 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -64,13 +64,8 @@ outputs: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ] kolla_config: - /var/lib/kolla/config_files/heat_api.json: - command: /usr/bin/heat-api --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_api.json: + command: /usr/bin/heat-api --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf docker_config: step_4: heat_api: @@ -82,12 +77,12 @@ outputs: privileged: false restart: always volumes: - - /run:/run - /var/lib/kolla/config_files/heat_api.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 - /dev:/dev + - /run:/run environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS upgrade_tasks: |