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
/
gnocchi-metricd.yaml
diff --git
a/docker/services/gnocchi-metricd.yaml
b/docker/services/gnocchi-metricd.yaml
index
2724805
..
ea26d83
100644
(file)
--- a/
docker/services/gnocchi-metricd.yaml
+++ b/
docker/services/gnocchi-metricd.yaml
@@
-68,7
+68,7
@@
outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
kolla_config:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
kolla_config:
- /var/lib/kolla/config_files/gnocchi
-
metricd.json:
+ /var/lib/kolla/config_files/gnocchi
_
metricd.json:
command: /usr/bin/gnocchi-metricd
permissions:
- path: /var/log/gnocchi
command: /usr/bin/gnocchi-metricd
permissions:
- path: /var/log/gnocchi
@@
-85,7
+85,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/gnocchi
-
metricd.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/gnocchi
_
metricd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- /var/log/containers/gnocchi:/var/log/gnocchi
environment:
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- /var/log/containers/gnocchi:/var/log/gnocchi
environment: