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 "Enable heat/puppet to manage the fernet keys and make it configurable"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
ceilometer-agent-notification.yaml
diff --git
a/docker/services/ceilometer-agent-notification.yaml
b/docker/services/ceilometer-agent-notification.yaml
index
79df330
..
36424e9
100644
(file)
--- a/
docker/services/ceilometer-agent-notification.yaml
+++ b/
docker/services/ceilometer-agent-notification.yaml
@@
-68,7
+68,7
@@
outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
kolla_config:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
kolla_config:
- /var/lib/kolla/config_files/ceilometer
-agent-
notification.json:
+ /var/lib/kolla/config_files/ceilometer
_agent_
notification.json:
command: /usr/bin/ceilometer-agent-notification
docker_config:
step_3:
command: /usr/bin/ceilometer-agent-notification
docker_config:
step_3:
@@
-80,7
+80,7
@@
outputs:
volumes:
- /var/log/containers/ceilometer:/var/log/ceilometer
step_4:
volumes:
- /var/log/containers/ceilometer:/var/log/ceilometer
step_4:
- ceilometer_agent
-
notification:
+ ceilometer_agent
_
notification:
image: *ceilometer_agent_notification_image
net: host
privileged: false
image: *ceilometer_agent_notification_image
net: host
privileged: false
@@
-89,7
+89,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/ceilometer
-agent-
notification.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/ceilometer
_agent_
notification.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS