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 "Replace outdated instruction with link to upstream doc"
[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
..
f75c57b
100644
(file)
--- a/
docker/services/aodh-evaluator.yaml
+++ b/
docker/services/aodh-evaluator.yaml
@@
-4,19
+4,21
@@
description: >
OpenStack containerized Aodh Evaluator service
parameters:
OpenStack containerized Aodh Evaluator service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerAodhEvaluatorImage:
description: image
DockerAodhEvaluatorImage:
description: image
- default: 'centos-binary-aodh-evaluator:latest'
+ type: string
+ DockerAodhConfigImage:
+ description: The container image to use for the aodh config_volume
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-44,6
+46,7
@@
resources:
type: ../../puppet/services/aodh-evaluator.yaml
properties:
EndpointMap: {get_param: EndpointMap}
type: ../../puppet/services/aodh-evaluator.yaml
properties:
EndpointMap: {get_param: EndpointMap}
+ ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
@@
-65,13
+68,15
@@
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
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
+ config_image: {get_param: DockerAodhConfigImage}
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
command: /usr/bin/aodh-evaluator
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/aodh
owner: aodh:aodh
permissions:
- path: /var/log/aodh
owner: aodh:aodh
@@
-79,7
+84,7
@@
outputs:
docker_config:
step_4:
aodh_evaluator:
docker_config:
step_4:
aodh_evaluator:
- image:
*aodh_evaluator_image
+ image:
{get_param: DockerAodhEvaluatorImage}
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always
@@
-87,8
+92,8
@@
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/config-data/
aodh/etc/aodh/:/etc/aodh/
:ro
+ - /var/lib/kolla/config_files/aodh
_
evaluator.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/
puppet-generated/aodh/:/var/lib/kolla/config_files/src
:ro
- /var/log/containers/aodh:/var/log/aodh
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- /var/log/containers/aodh:/var/log/aodh
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS