aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/aodh-listener.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-23 18:21:43 +0200
committerMartin André <m.andre@redhat.com>2017-06-28 10:48:53 +0200
commita474ae82d5f157a48c997fb9df420442bd79dcbe (patch)
tree567735ea0e9dbd668b908740dc4526e99ef5a289 /docker/services/aodh-listener.yaml
parent8c41b702f5b1c7baf2f2160b92067bcc0267c958 (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/aodh-listener.yaml')
-rw-r--r--docker/services/aodh-listener.yaml13
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 0930f42..d78af5b 100644
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-aodh-listener:latest'
type: string
+ DockerAodhConfigImage:
+ description: The container image to use for the aodh config_volume
+ default: 'centos-binary-aodh-api:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -65,10 +69,10 @@ outputs:
config_volume: aodh
puppet_tags: aodh_config
step_config: *step_config
- config_image: &aodh_listener_image
+ config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/aodh_listener.json:
command: /usr/bin/aodh-listener
@@ -79,7 +83,10 @@ outputs:
docker_config:
step_4:
aodh_listener:
- image: *aodh_listener_image
+ image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
net: host
privileged: false
restart: always