aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/heat-api-cfn.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-29 20:12:59 +0000
committerGerrit Code Review <review@openstack.org>2017-06-29 20:12:59 +0000
commite8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch)
tree2290212e2b6f529824dc499badfba578a892421b /docker/services/heat-api-cfn.yaml
parent3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff)
parenta474ae82d5f157a48c997fb9df420442bd79dcbe (diff)
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/heat-api-cfn.yaml')
-rw-r--r--docker/services/heat-api-cfn.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 89ba8cbd..1905281d 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -13,8 +13,8 @@ parameters:
default: 'centos-binary-heat-api-cfn:latest'
type: string
# puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
- DockerHeatConfigImage:
- description: image
+ DockerHeatApiCfnConfigImage:
+ description: The container image to use for the heat_api_cfn config_volume
default: 'centos-binary-heat-api-cfn:latest'
type: string
EndpointMap:
@@ -81,7 +81,7 @@ outputs:
config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/heat_api_cfn.json:
command: /usr/sbin/httpd -DFOREGROUND