diff options
author | 2017-06-23 18:21:43 +0200 | |
---|---|---|
committer | 2017-06-28 10:48:53 +0200 | |
commit | a474ae82d5f157a48c997fb9df420442bd79dcbe (patch) | |
tree | 567735ea0e9dbd668b908740dc4526e99ef5a289 /docker/services/heat-api.yaml | |
parent | 8c41b702f5b1c7baf2f2160b92067bcc0267c958 (diff) |
Add heat parameter for all of config_volume images
This commit consistently defines a heat template parameter in the form
of DockerXXXConfigImage where XXX represents the name of the
config_volume that is used by docker-puppet.
The goal is to mitigate hard to debug errors where the templates would
set different defaults for the image docker-puppet.py uses to run, for
the same config_volume name.
This fixes a couple of inconsistencies on the way.
Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b
Closes-Bug: #1699791
Diffstat (limited to 'docker/services/heat-api.yaml')
-rw-r--r-- | docker/services/heat-api.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 834f2a0b..c0cec937 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -13,8 +13,8 @@ parameters: default: 'centos-binary-heat-api:latest' type: string # puppet needs the heat-wsgi-api binary from centos-binary-heat-api - DockerHeatConfigImage: - description: image + DockerHeatApiConfigImage: + description: The container image to use for the heat_api config_volume default: 'centos-binary-heat-api:latest' type: string EndpointMap: @@ -81,7 +81,7 @@ outputs: config_image: list_join: - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ] + - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiConfigImage} ] kolla_config: /var/lib/kolla/config_files/heat_api.json: command: /usr/sbin/httpd -DFOREGROUND |