Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "adding --config-dir parameters to neutron containers"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
aodh-evaluator.yaml
diff --git
a/docker/services/aodh-evaluator.yaml
b/docker/services/aodh-evaluator.yaml
index
9d514d0
..
108a552
100644
(file)
--- a/
docker/services/aodh-evaluator.yaml
+++ b/
docker/services/aodh-evaluator.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-aodh-evaluator:latest'
type: string
description: image
default: 'centos-binary-aodh-evaluator: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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-65,12
+69,12
@@
outputs:
config_volume: aodh
puppet_tags: aodh_config
step_config: *step_config
config_volume: aodh
puppet_tags: aodh_config
step_config: *step_config
- config_image:
&aodh_evaluator_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerAodh
Evaluator
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerAodh
Config
Image} ]
kolla_config:
kolla_config:
- /var/lib/kolla/config_files/aodh
-
evaluator.json:
+ /var/lib/kolla/config_files/aodh
_
evaluator.json:
command: /usr/bin/aodh-evaluator
permissions:
- path: /var/log/aodh
command: /usr/bin/aodh-evaluator
permissions:
- path: /var/log/aodh
@@
-79,7
+83,10
@@
outputs:
docker_config:
step_4:
aodh_evaluator:
docker_config:
step_4:
aodh_evaluator:
- image: *aodh_evaluator_image
+ image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always
@@
-87,7
+94,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/aodh
-
evaluator.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/aodh
_
evaluator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- /var/log/containers/aodh:/var/log/aodh
environment:
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- /var/log/containers/aodh:/var/log/aodh
environment: